summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-11-0676-1047/+2783
| | | | | Change-Id: I547111eb6c7ff68ebe835d65bb24e0a841ecdb90 Auto-generated-cl: translation import
* am 7b17e24d: am a9086ee9: Show accurate connection status for ephemeral ↵Jeff Davidson2014-11-063-39/+92
|\ | | | | | | | | | | | | networks. automerge: b46a919 * commit '7b17e24d36e5fd3263204a4ee666e85a4a006b90': Show accurate connection status for ephemeral networks.
| * am a9086ee9: Show accurate connection status for ephemeral networks. ↵Jeff Davidson2014-11-063-39/+92
| |\ | | | | | | | | | | | | | | | | | | automerge: b46a919 * commit 'a9086ee973d61ca009f11372b8182572664b15cd': Show accurate connection status for ephemeral networks.
| | * Show accurate connection status for ephemeral networks.Jeff Davidson2014-11-063-39/+92
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: b46a919 * commit 'b46a9194fe88a26e80d415919d191703c340925e': Show accurate connection status for ephemeral networks.
| | | * Show accurate connection status for ephemeral networks.Jeff Davidson2014-11-053-39/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configurations for these networks are not returned in getConfiguredNetworks() and likely shouldn't be as clients of this API would not expect them. (Note also that the ephemeral bit is marked @hide). But the framework may connect to them regardless. In these cases, as long as the connection status is something other than the coarse-level DISCONNECTED, we show the status to be an accurate representation of Wi-Fi state. (To make this possible, we pass around the full NetworkInfo instead of just the DetailedState, allowing us to get the coarse state where needed). When long pressing on a non-DISCONNECTED ephemeral network, we offer the ability to save the configuration. (Note that this flow is currently broken and being tracked by another bug, but the behavior is consistent with what happens when you simply click on the SSID). Bug: 18205278 Change-Id: I30592c89546068c796f458a86bb26eb3b28c64df
* | | | am 88bcd116: am 0d482f24: am 815c61d7: Merge "Change for setting ↵Sanket Padawe2014-11-053-21/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | transparency of sim colors." into lmp-mr1-dev * commit '88bcd116eb74ceb9756b71e9e208c25c41c98b7a': Change for setting transparency of sim colors.
| * | | am 0d482f24: am 815c61d7: Merge "Change for setting transparency of sim ↵Sanket Padawe2014-11-053-21/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | colors." into lmp-mr1-dev * commit '0d482f2483183df0856e4f56e962c22cee5869d7': Change for setting transparency of sim colors.
| | * | am 815c61d7: Merge "Change for setting transparency of sim colors." into ↵Sanket Padawe2014-11-053-21/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '815c61d729715e6d7a19fbf4f039d59d0dddc265': Change for setting transparency of sim colors.
| | | * Merge "Change for setting transparency of sim colors." into lmp-mr1-devSanket Padawe2014-11-053-21/+1
| | | |\
| | | | * Change for setting transparency of sim colors.Sanket Padawe2014-11-043-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes for setting transparency of sim colors in sim settings UI. Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
* | | | | am bdeb3b9b: am 2d256206: Merge "Settings: Allow user to configure "None" ↵John Spurlock2014-11-053-2/+43
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | for downtime." into lmp-mr1-dev automerge: 92f0246 * commit 'bdeb3b9beed36d4c62255961c358d23071e6687b': Settings: Allow user to configure "None" for downtime.
| * | | | am 2d256206: Merge "Settings: Allow user to configure "None" for downtime." ↵John Spurlock2014-11-053-2/+43
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 92f0246 * commit '2d25620627448ba91bf6beafc174d5f6c6a4bbb6': Settings: Allow user to configure "None" for downtime.
| | * | | Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-devJohn Spurlock2014-11-053-2/+43
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 92f0246 * commit '92f02463fcea8e428b3be028082e8895ac8c5708': Settings: Allow user to configure "None" for downtime.
| | | * | Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-devJohn Spurlock2014-11-053-2/+43
| | | |\ \
| | | | * | Settings: Allow user to configure "None" for downtime.John Spurlock2014-11-053-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New setting under Zen > Downtime subcategory. Also rename the category header, remove obsolete parenthetical. Bug: 16373455 Change-Id: Ic3430e1795fc79c315dea3c24d88dfcde6742849
* | | | | | am 55674c31: am bac2d4d6: am 63530b56: Merge "Sim name doesn\'t persist on ↵Sanket Padawe2014-11-051-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reboot" into lmp-mr1-dev * commit '55674c31aab544f3856f2ff23f26745b8bcb65c3': Sim name doesn't persist on reboot
| * | | | | am bac2d4d6: am 63530b56: Merge "Sim name doesn\'t persist on reboot" into ↵Sanket Padawe2014-11-051-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'bac2d4d6a60550ad6af7a560e1d6b14eabfef1be': Sim name doesn't persist on reboot
| | * | | | am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-devSanket Padawe2014-11-051-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '63530b56bba0de22309633d4f05fd2e74901474d': Sim name doesn't persist on reboot
| | | * | | Merge "Sim name doesn't persist on reboot" into lmp-mr1-devSanket Padawe2014-11-051-1/+2
| | | |\ \ \
| | | | * | | Sim name doesn't persist on rebootSanket Padawe2014-11-041-1/+2
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sim name was not persisting on changed by user because of wrong api call. Bug: 18024820 Change-Id: I7dee4a181f17f8cfabe48fefb92d7fc407efbe59
* | | | | | am 7d3e182c: Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ↵Andres Morales2014-11-052-1/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea4d9a9 automerge: eb55ac9 * commit '7d3e182c18978c7da43194d9deb564e5724b06e2': Confirm enabling OEM unlock with warning dialog Request PIN confirmation to enable OEM unlock
| * | | | | Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9Andres Morales2014-11-052-1/+52
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: eb55ac9 * commit 'eb55ac90dd8034a64ac146c4f4829b1e8bab1d17': Confirm enabling OEM unlock with warning dialog Request PIN confirmation to enable OEM unlock
| | * | | | Merge changes I326a4cf2,I1cfce513 into lmp-mr1-devAndres Morales2014-11-052-1/+52
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ea4d9a9 * commit 'ea4d9a9eca7e18d35e521d80d57628f5a7347e55': Confirm enabling OEM unlock with warning dialog Request PIN confirmation to enable OEM unlock
| | | * | | Merge changes I326a4cf2,I1cfce513 into lmp-mr1-devAndres Morales2014-11-052-1/+52
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Confirm enabling OEM unlock with warning dialog Request PIN confirmation to enable OEM unlock
| | | | * | | Confirm enabling OEM unlock with warning dialogAndres Morales2014-11-042-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18227644 Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
| | | | * | | Request PIN confirmation to enable OEM unlockAndres Morales2014-11-032-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18191568 Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
* | | | | | | am 1e4d6e64: Merge "Don\'t show a pattern-specific prompt at encryption ↵Paul Crowley2014-11-055-17/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time." into lmp-mr1-dev automerge: e6ad7bf automerge: 966a1ca * commit '1e4d6e64a43a1eb5de893a71178c64d240d01f9f': Don't show a pattern-specific prompt at encryption time.
| * | | | | | Merge "Don\'t show a pattern-specific prompt at encryption time." into ↵Paul Crowley2014-11-055-17/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e6ad7bf automerge: 966a1ca * commit '966a1cadbf83412384261d1eea1192150e5fd1a8': Don't show a pattern-specific prompt at encryption time.
| | * | | | | Merge "Don\'t show a pattern-specific prompt at encryption time." into ↵Paul Crowley2014-11-055-17/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e6ad7bf * commit 'e6ad7bf05263941ea89b8dda7cded6f9d434a6da': Don't show a pattern-specific prompt at encryption time.
| | | * | | | Merge "Don't show a pattern-specific prompt at encryption time." into ↵Paul Crowley2014-11-055-17/+5
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | lmp-mr1-dev
| | | | * | | Don't show a pattern-specific prompt at encryption time.Paul Crowley2014-11-055-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18054895 Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
* | | | | | | am 7ce01fe3: am ed321aec: am 7db037a9: Merge "Save missing state in ↵Alexandra Gherghina2014-11-051-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConfirmAutoSyncChangeFragment" into lmp-mr1-dev * commit '7ce01fe3529c4095301dc49836953a00f604eeed': Save missing state in ConfirmAutoSyncChangeFragment
| * | | | | | am ed321aec: am 7db037a9: Merge "Save missing state in ↵Alexandra Gherghina2014-11-051-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConfirmAutoSyncChangeFragment" into lmp-mr1-dev * commit 'ed321aec3359eca1d3b417e93bd1de1f64c713cb': Save missing state in ConfirmAutoSyncChangeFragment
| | * | | | | am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" ↵Alexandra Gherghina2014-11-051-0/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '7db037a989ea9c106ea404681cfe22a1fd2a2973': Save missing state in ConfirmAutoSyncChangeFragment
| | | * | | | Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-devAlexandra Gherghina2014-11-051-0/+3
| | | |\ \ \ \
| | | | * | | | Save missing state in ConfirmAutoSyncChangeFragmentAlexandra Gherghina2014-11-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18117345 Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
* | | | | | | | am e1c89279: am 05c19a45: am b153181c: Use CharSequence for DisplayNameStuart Scott2014-11-052-3/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1c8927961c337e633db994d456e627e296d1210': Use CharSequence for DisplayName
| * | | | | | | am 05c19a45: am b153181c: Use CharSequence for DisplayNameStuart Scott2014-11-052-3/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '05c19a45e2b46f70323b33818eba657ef40ad455': Use CharSequence for DisplayName
| | * | | | | | am b153181c: Use CharSequence for DisplayNameStuart Scott2014-11-052-3/+7
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b153181c9c597085769d69796ecf07ec6d4433d2': Use CharSequence for DisplayName
| | | * | | | | Use CharSequence for DisplayNameStuart Scott2014-11-042-3/+7
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
* | | | | | | am 68421fd5: am e1cb279f: am 508a693c: Merge "sanitize strings and error ↵vandwalle2014-11-042-5/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages in wiFi picker" into lmp-mr1-dev * commit '68421fd5c66d2c14ffddc989ccb2815c4da74352': sanitize strings and error messages in wiFi picker
| * | | | | | am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi ↵vandwalle2014-11-042-5/+21
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | picker" into lmp-mr1-dev * commit 'e1cb279f3ebb8813c07c988c3a432825563ccfda': sanitize strings and error messages in wiFi picker
| | * | | | | am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into ↵vandwalle2014-11-042-5/+21
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '508a693c9a240a5f297704c8cc837a3cb5702d6c': sanitize strings and error messages in wiFi picker
| | | * | | | Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-devvandwalle2014-11-042-5/+21
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | sanitize strings and error messages in wiFi pickervandwalle2014-11-042-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
* | | | | | | am 204624ca: am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in ↵Alexandra Gherghina2014-11-041-2/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secondary users" into lmp-mr1-dev * commit '204624ca12b8a11256dc4a8a41ef252bd68f20e7': Hide managed profile entry in secondary users
| * | | | | | am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in secondary ↵Alexandra Gherghina2014-11-041-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users" into lmp-mr1-dev * commit '3016f721f1215bd6bb54f6e16a46a63d3557ee55': Hide managed profile entry in secondary users
| | * | | | | am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into ↵Alexandra Gherghina2014-11-041-2/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '2a03d8e2991b64740c803c65e2e09ba69180a02e': Hide managed profile entry in secondary users
| | | * | | | Merge "Hide managed profile entry in secondary users" into lmp-mr1-devAlexandra Gherghina2014-11-041-2/+9
| | | |\ \ \ \
| | | | * | | | Hide managed profile entry in secondary usersAlexandra Gherghina2014-10-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18132630 Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
generated by cgit v1.1 at 2025-01-11 02:58:25 +0000