OSDN Git Service
Baligh Uddin [Fri, 7 Nov 2014 15:02:33 +0000 (15:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Alexandra Gherghina [Fri, 7 Nov 2014 10:48:44 +0000 (10:48 +0000)]
am
bea0f7f9: am
a4a7b739: am
c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
* commit '
bea0f7f9a0043b9a5b93a7fa1615d332a61dd7e3':
Disable app notifications checkbox for uninstalled apps
Alexandra Gherghina [Fri, 7 Nov 2014 10:48:43 +0000 (10:48 +0000)]
am
6f8019d8: am
fcb880c6: am
ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '
6f8019d8891095cce375ce7f7ebbf3ad8ba6d57c':
Update text for apps installed for other users
Alexandra Gherghina [Fri, 7 Nov 2014 10:44:53 +0000 (10:44 +0000)]
am
a4a7b739: am
c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
* commit '
a4a7b739ac22413f886180440d6ccfba1e373c31':
Disable app notifications checkbox for uninstalled apps
Alexandra Gherghina [Fri, 7 Nov 2014 10:44:51 +0000 (10:44 +0000)]
am
fcb880c6: am
ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '
fcb880c6d1cbe23bcfcbd92f1b6cdc3c88892e39':
Update text for apps installed for other users
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:43 +0000 (10:39 +0000)]
am
c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
* commit '
c66eb698a9e5e4b6e684ba38a92e7c0ce8bd596a':
Disable app notifications checkbox for uninstalled apps
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:42 +0000 (10:39 +0000)]
am
ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '
ee70c69919d3e49ba76d2710850fd70be5c09998':
Update text for apps installed for other users
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:52 +0000 (10:35 +0000)]
Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:37 +0000 (10:35 +0000)]
Merge "Update text for apps installed for other users" into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 13:20:56 +0000 (13:20 +0000)]
Disable app notifications checkbox for uninstalled apps
Bug:
18253810
Change-Id: I99fb2ae34b16944fd839db4e7c380b2d32f3b85d
Alexandra Gherghina [Wed, 29 Oct 2014 15:29:17 +0000 (15:29 +0000)]
Update text for apps installed for other users
This also refactors the layout to accommodate longer text
Bug:
16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
Fabrice Di Meglio [Fri, 7 Nov 2014 04:17:46 +0000 (04:17 +0000)]
am
981ab4b2: am
a581a16d: am
fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
* commit '
981ab4b2f194c52f4401b3c6e55fb9549204e051':
Update synonyms and fix some issues related to them
Paul Crowley [Fri, 7 Nov 2014 04:15:35 +0000 (04:15 +0000)]
am
0844554f: am
83b4fac5: am
41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
* commit '
0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
Add a new flow for decryption checking.
Jeff Davidson [Fri, 7 Nov 2014 04:12:59 +0000 (04:12 +0000)]
am
0fc9271b: am
c4a68608: am
99f191f5: Remove the Wi-Fi Assistant card.
* commit '
0fc9271b21b46b6972dcf0e976d20605042b0b38':
Remove the Wi-Fi Assistant card.
Fabrice Di Meglio [Fri, 7 Nov 2014 01:55:39 +0000 (01:55 +0000)]
am
a581a16d: am
fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
* commit '
a581a16dcd7bd02260ce4e3c1e8635478a817bc1':
Update synonyms and fix some issues related to them
Fabrice Di Meglio [Fri, 7 Nov 2014 01:46:20 +0000 (01:46 +0000)]
am
fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
* commit '
fff7e020e83b1f23de11a842c56728f8a739a8d1':
Update synonyms and fix some issues related to them
Fabrice Di Meglio [Fri, 7 Nov 2014 01:39:24 +0000 (01:39 +0000)]
Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 00:57:04 +0000 (16:57 -0800)]
Update synonyms and fix some issues related to them
- update synonyms definitions
- fix issue with L release regression for indexing "Backup & reset":
was missing the marker interface "Indexable"
- fix non working synonyms for "Language & input": their declaration
was done in the XML preference file but was not used because the
SearchIndexProvider was built "by hand"
See bug #
17474866 Settings search synonyms needs an update
Change-Id: Iceab71a0e3214f3a8ba0dcd77756c3632609c5ce
Paul Crowley [Fri, 7 Nov 2014 00:40:47 +0000 (00:40 +0000)]
am
83b4fac5: am
41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
* commit '
83b4fac50a198187f410e2b4e8694c22db173d45':
Add a new flow for decryption checking.
Paul Crowley [Fri, 7 Nov 2014 00:33:42 +0000 (00:33 +0000)]
am
41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
* commit '
41c197797832efd2acee013c0079fe7850559795':
Add a new flow for decryption checking.
Paul Crowley [Fri, 7 Nov 2014 00:26:44 +0000 (00:26 +0000)]
Merge "Add a new flow for decryption checking." into lmp-mr1-dev
Jeff Davidson [Fri, 7 Nov 2014 00:24:21 +0000 (00:24 +0000)]
am
c4a68608: am
99f191f5: Remove the Wi-Fi Assistant card.
* commit '
c4a686086cf85808fea1f10a6072d197cffb686b':
Remove the Wi-Fi Assistant card.
Jeff Davidson [Fri, 7 Nov 2014 00:09:36 +0000 (00:09 +0000)]
am
99f191f5: Remove the Wi-Fi Assistant card.
* commit '
99f191f5856bb266854d7b08a50523626eb70f72':
Remove the Wi-Fi Assistant card.
Jeff Davidson [Thu, 6 Nov 2014 21:30:34 +0000 (13:30 -0800)]
Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug:
13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
Stuart Scott [Thu, 6 Nov 2014 21:08:03 +0000 (21:08 +0000)]
am
65ea49a2: am
74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge:
ac61828
* commit '
65ea49a2fb8363dd57ac2d881a4c34af70e07c7c':
Fix NPE when parceling SubInfoRecord
Stuart Scott [Thu, 6 Nov 2014 19:26:57 +0000 (19:26 +0000)]
am
74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge:
ac61828
* commit '
7492442451b960b1b8667d3424d81b8590c842c3':
Fix NPE when parceling SubInfoRecord
Stuart Scott [Thu, 6 Nov 2014 18:54:42 +0000 (18:54 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge:
ac61828
* commit '
ac61828bed8219b94afe4fe2f32cae6ef70130c0':
Fix NPE when parceling SubInfoRecord
Stuart Scott [Thu, 6 Nov 2014 18:25:49 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
Baligh Uddin [Thu, 6 Nov 2014 18:02:24 +0000 (10:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I547111eb6c7ff68ebe835d65bb24e0a841ecdb90
Auto-generated-cl: translation import
Paul Crowley [Tue, 21 Oct 2014 09:12:47 +0000 (10:12 +0100)]
Add a new flow for decryption checking.
Bug:
17875087
Change-Id: I78ba98901bc74ae654414c0a4a303b104a629965
Jeff Davidson [Thu, 6 Nov 2014 02:27:33 +0000 (02:27 +0000)]
am
7b17e24d: am
a9086ee9: Show accurate connection status for ephemeral networks. automerge:
b46a919
* commit '
7b17e24d36e5fd3263204a4ee666e85a4a006b90':
Show accurate connection status for ephemeral networks.
Jeff Davidson [Thu, 6 Nov 2014 02:22:51 +0000 (02:22 +0000)]
am
a9086ee9: Show accurate connection status for ephemeral networks. automerge:
b46a919
* commit '
a9086ee973d61ca009f11372b8182572664b15cd':
Show accurate connection status for ephemeral networks.
Jeff Davidson [Thu, 6 Nov 2014 02:18:57 +0000 (02:18 +0000)]
Show accurate connection status for ephemeral networks.
automerge:
b46a919
* commit '
b46a9194fe88a26e80d415919d191703c340925e':
Show accurate connection status for ephemeral networks.
Stuart Scott [Wed, 5 Nov 2014 23:08:16 +0000 (15:08 -0800)]
Fix NPE when parceling SubInfoRecord
bug:
18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
Jeff Davidson [Tue, 4 Nov 2014 02:47:28 +0000 (18:47 -0800)]
Show accurate connection status for ephemeral networks.
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
Sanket Padawe [Wed, 5 Nov 2014 20:53:39 +0000 (20:53 +0000)]
am
88bcd116: am
0d482f24: am
815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
* commit '
88bcd116eb74ceb9756b71e9e208c25c41c98b7a':
Change for setting transparency of sim colors.
John Spurlock [Wed, 5 Nov 2014 20:53:38 +0000 (20:53 +0000)]
am
bdeb3b9b: am
2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge:
92f0246
* commit '
bdeb3b9beed36d4c62255961c358d23071e6687b':
Settings: Allow user to configure "None" for downtime.
Sanket Padawe [Wed, 5 Nov 2014 20:44:25 +0000 (20:44 +0000)]
am
0d482f24: am
815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
* commit '
0d482f2483183df0856e4f56e962c22cee5869d7':
Change for setting transparency of sim colors.
John Spurlock [Wed, 5 Nov 2014 20:43:46 +0000 (20:43 +0000)]
am
2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge:
92f0246
* commit '
2d25620627448ba91bf6beafc174d5f6c6a4bbb6':
Settings: Allow user to configure "None" for downtime.
Sanket Padawe [Wed, 5 Nov 2014 20:35:27 +0000 (20:35 +0000)]
am
815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
* commit '
815c61d729715e6d7a19fbf4f039d59d0dddc265':
Change for setting transparency of sim colors.
Sanket Padawe [Wed, 5 Nov 2014 20:30:26 +0000 (20:30 +0000)]
Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 19:34:02 +0000 (19:34 +0000)]
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
automerge:
92f0246
* commit '
92f02463fcea8e428b3be028082e8895ac8c5708':
Settings: Allow user to configure "None" for downtime.
John Spurlock [Wed, 5 Nov 2014 19:17:49 +0000 (19:17 +0000)]
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 19:07:23 +0000 (19:07 +0000)]
am
55674c31: am
bac2d4d6: am
63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
* commit '
55674c31aab544f3856f2ff23f26745b8bcb65c3':
Sim name doesn't persist on reboot
Sanket Padawe [Wed, 5 Nov 2014 19:01:07 +0000 (19:01 +0000)]
am
bac2d4d6: am
63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
* commit '
bac2d4d6a60550ad6af7a560e1d6b14eabfef1be':
Sim name doesn't persist on reboot
Sanket Padawe [Wed, 5 Nov 2014 18:50:14 +0000 (18:50 +0000)]
am
63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
* commit '
63530b56bba0de22309633d4f05fd2e74901474d':
Sim name doesn't persist on reboot
Andres Morales [Wed, 5 Nov 2014 18:48:07 +0000 (18:48 +0000)]
am
7d3e182c: Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge:
ea4d9a9 automerge:
eb55ac9
* commit '
7d3e182c18978c7da43194d9deb564e5724b06e2':
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
Paul Crowley [Wed, 5 Nov 2014 18:48:06 +0000 (18:48 +0000)]
am
1e4d6e64: Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge:
e6ad7bf automerge:
966a1ca
* commit '
1e4d6e64a43a1eb5de893a71178c64d240d01f9f':
Don't show a pattern-specific prompt at encryption time.
Andres Morales [Wed, 5 Nov 2014 18:08:26 +0000 (18:08 +0000)]
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge:
ea4d9a9
automerge:
eb55ac9
* commit '
eb55ac90dd8034a64ac146c4f4829b1e8bab1d17':
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
Paul Crowley [Wed, 5 Nov 2014 18:05:05 +0000 (18:05 +0000)]
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge:
e6ad7bf
automerge:
966a1ca
* commit '
966a1cadbf83412384261d1eea1192150e5fd1a8':
Don't show a pattern-specific prompt at encryption time.
Sanket Padawe [Wed, 5 Nov 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev
Andres Morales [Wed, 5 Nov 2014 17:38:35 +0000 (17:38 +0000)]
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
automerge:
ea4d9a9
* commit '
ea4d9a9eca7e18d35e521d80d57628f5a7347e55':
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
John Spurlock [Wed, 5 Nov 2014 17:04:16 +0000 (12:04 -0500)]
Settings: Allow user to configure "None" for downtime.
New setting under Zen > Downtime subcategory. Also rename the
category header, remove obsolete parenthetical.
Bug:
16373455
Change-Id: Ic3430e1795fc79c315dea3c24d88dfcde6742849
Paul Crowley [Wed, 5 Nov 2014 16:35:53 +0000 (16:35 +0000)]
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev
automerge:
e6ad7bf
* commit '
e6ad7bf05263941ea89b8dda7cded6f9d434a6da':
Don't show a pattern-specific prompt at encryption time.
Andres Morales [Wed, 5 Nov 2014 16:31:54 +0000 (16:31 +0000)]
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
* changes:
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
Paul Crowley [Wed, 5 Nov 2014 15:57:08 +0000 (15:57 +0000)]
Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 10:19:12 +0000 (10:19 +0000)]
am
7ce01fe3: am
ed321aec: am
7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit '
7ce01fe3529c4095301dc49836953a00f604eeed':
Save missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Wed, 5 Nov 2014 10:15:02 +0000 (10:15 +0000)]
am
ed321aec: am
7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit '
ed321aec3359eca1d3b417e93bd1de1f64c713cb':
Save missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Wed, 5 Nov 2014 10:09:58 +0000 (10:09 +0000)]
am
7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit '
7db037a989ea9c106ea404681cfe22a1fd2a2973':
Save missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Wed, 5 Nov 2014 10:06:35 +0000 (10:06 +0000)]
Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
Stuart Scott [Wed, 5 Nov 2014 04:17:51 +0000 (04:17 +0000)]
am
e1c89279: am
05c19a45: am
b153181c: Use CharSequence for DisplayName
* commit '
e1c8927961c337e633db994d456e627e296d1210':
Use CharSequence for DisplayName
Stuart Scott [Wed, 5 Nov 2014 04:05:35 +0000 (04:05 +0000)]
am
05c19a45: am
b153181c: Use CharSequence for DisplayName
* commit '
05c19a45e2b46f70323b33818eba657ef40ad455':
Use CharSequence for DisplayName
Sanket Padawe [Wed, 5 Nov 2014 02:14:39 +0000 (18:14 -0800)]
Change for setting transparency of sim colors.
Changes for setting transparency of sim colors in sim settings UI.
Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
Stuart Scott [Wed, 5 Nov 2014 02:13:21 +0000 (02:13 +0000)]
am
b153181c: Use CharSequence for DisplayName
* commit '
b153181c9c597085769d69796ecf07ec6d4433d2':
Use CharSequence for DisplayName
Sanket Padawe [Wed, 5 Nov 2014 01:34:47 +0000 (17:34 -0800)]
Sim name doesn't persist on reboot
Sim name was not persisting on changed by user because of wrong api call.
Bug:
18024820
Change-Id: I7dee4a181f17f8cfabe48fefb92d7fc407efbe59
Paul Crowley [Tue, 4 Nov 2014 22:51:36 +0000 (22:51 +0000)]
Don't show a pattern-specific prompt at encryption time.
Bug:
18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
Alexandra Gherghina [Tue, 4 Nov 2014 14:06:47 +0000 (14:06 +0000)]
Save missing state in ConfirmAutoSyncChangeFragment
Bug:
18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
Stuart Scott [Tue, 4 Nov 2014 22:52:23 +0000 (14:52 -0800)]
Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
vandwalle [Tue, 4 Nov 2014 20:23:28 +0000 (20:23 +0000)]
am
68421fd5: am
e1cb279f: am
508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
* commit '
68421fd5c66d2c14ffddc989ccb2815c4da74352':
sanitize strings and error messages in wiFi picker
vandwalle [Tue, 4 Nov 2014 20:18:58 +0000 (20:18 +0000)]
am
e1cb279f: am
508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
* commit '
e1cb279f3ebb8813c07c988c3a432825563ccfda':
sanitize strings and error messages in wiFi picker
vandwalle [Tue, 4 Nov 2014 20:12:02 +0000 (20:12 +0000)]
am
508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
* commit '
508a693c9a240a5f297704c8cc837a3cb5702d6c':
sanitize strings and error messages in wiFi picker
vandwalle [Tue, 4 Nov 2014 20:07:44 +0000 (20:07 +0000)]
Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
vandwalle [Tue, 4 Nov 2014 01:07:05 +0000 (17:07 -0800)]
sanitize strings and error messages in wiFi picker
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
Andres Morales [Tue, 4 Nov 2014 18:58:19 +0000 (10:58 -0800)]
Confirm enabling OEM unlock with warning dialog
Bug:
18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
Alexandra Gherghina [Tue, 4 Nov 2014 14:03:03 +0000 (14:03 +0000)]
am
204624ca: am
3016f721: am
2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
* commit '
204624ca12b8a11256dc4a8a41ef252bd68f20e7':
Hide managed profile entry in secondary users
Alexandra Gherghina [Tue, 4 Nov 2014 14:03:02 +0000 (14:03 +0000)]
am
ab054dc1: am
06ad8ce5: am
d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
* commit '
ab054dc138041e5cb77b24aab0f85a40e78eb942':
Apply predefined icon and label to managed profiles
Alexandra Gherghina [Tue, 4 Nov 2014 13:59:23 +0000 (13:59 +0000)]
am
3016f721: am
2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
* commit '
3016f721f1215bd6bb54f6e16a46a63d3557ee55':
Hide managed profile entry in secondary users
Alexandra Gherghina [Tue, 4 Nov 2014 13:59:22 +0000 (13:59 +0000)]
am
06ad8ce5: am
d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
* commit '
06ad8ce5974de67017abb8773646743295cf44f4':
Apply predefined icon and label to managed profiles
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:53 +0000 (13:54 +0000)]
am
2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
* commit '
2a03d8e2991b64740c803c65e2e09ba69180a02e':
Hide managed profile entry in secondary users
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:52 +0000 (13:54 +0000)]
am
d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
* commit '
d47f15a4746cda8522fc986a1b2478c76c46d71f':
Apply predefined icon and label to managed profiles
Alexandra Gherghina [Tue, 4 Nov 2014 13:51:04 +0000 (13:51 +0000)]
Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
Alexandra Gherghina [Tue, 4 Nov 2014 13:50:51 +0000 (13:50 +0000)]
Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
Stuart Scott [Tue, 4 Nov 2014 03:19:05 +0000 (03:19 +0000)]
am
6b12f54a: am
173ef409: Clean up public API of SubInfoRecord. automerge:
3ada2ec
* commit '
6b12f54abb6b3ed8327b941062c9293b26534511':
Clean up public API of SubInfoRecord.
Stuart Scott [Tue, 4 Nov 2014 03:07:28 +0000 (03:07 +0000)]
am
173ef409: Clean up public API of SubInfoRecord. automerge:
3ada2ec
* commit '
173ef409fddc4affd56e1014f4eced0a0b11f747':
Clean up public API of SubInfoRecord.
Stuart Scott [Tue, 4 Nov 2014 03:01:22 +0000 (03:01 +0000)]
Clean up public API of SubInfoRecord.
automerge:
3ada2ec
* commit '
3ada2ecbe02c98da529aa106e538a4439219cb62':
Clean up public API of SubInfoRecord.
PauloftheWest [Tue, 4 Nov 2014 01:13:53 +0000 (01:13 +0000)]
am
f75a8182: Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge:
ba53a84 automerge:
e8cf3ee
* commit '
f75a8182bd64983d3f9ec7208d0224a282af51e0':
Added cellular data popup in DataUsage
Andrew Lee [Tue, 4 Nov 2014 01:13:52 +0000 (01:13 +0000)]
am
1d671eb2: am
c53c5835: am
8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
* commit '
1d671eb24be9f585b9ca83e820cb8869313729f6':
Update class name for FdnList.
Andres Morales [Sat, 1 Nov 2014 01:23:47 +0000 (18:23 -0700)]
Request PIN confirmation to enable OEM unlock
Bug:
18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
PauloftheWest [Tue, 4 Nov 2014 00:06:12 +0000 (00:06 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge:
ba53a84
automerge:
e8cf3ee
* commit '
e8cf3eed1719621d3fe5c18641e98192730e49a0':
Added cellular data popup in DataUsage
Stuart Scott [Fri, 31 Oct 2014 21:11:24 +0000 (14:11 -0700)]
Clean up public API of SubInfoRecord.
bug:
17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
PauloftheWest [Mon, 3 Nov 2014 23:28:42 +0000 (23:28 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
automerge:
ba53a84
* commit '
ba53a846b153b7318d7fc9e21763369b43358e30':
Added cellular data popup in DataUsage
PauloftheWest [Mon, 3 Nov 2014 23:00:19 +0000 (23:00 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
Andrew Lee [Mon, 3 Nov 2014 22:34:38 +0000 (22:34 +0000)]
am
c53c5835: am
8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
* commit '
c53c58350df01d4f5593f9cd4a5deb956c2ab333':
Update class name for FdnList.
Andrew Lee [Mon, 3 Nov 2014 21:03:40 +0000 (21:03 +0000)]
am
8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
* commit '
8d4f7f94eb8804df9c91e9b9172fee80cdf7a8e1':
Update class name for FdnList.
Andrew Lee [Mon, 3 Nov 2014 21:00:04 +0000 (21:00 +0000)]
Merge "Update class name for FdnList." into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:54:26 +0000 (18:54 +0000)]
am
34aaabf1: (-s ours) am
2e5e181d: (-s ours) am
c6db3cc1: (-s ours) am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
34aaabf115755c1b7137e431fb8c44e7978df75a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:49:05 +0000 (18:49 +0000)]
am
2e5e181d: (-s ours) am
c6db3cc1: (-s ours) am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
2e5e181d0fce89b228ce26700c1588f9c0e5e17c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:39:41 +0000 (18:39 +0000)]
am
c6db3cc1: (-s ours) am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
c6db3cc1b71fcab1824fc327dfec66df69bf139c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:32:51 +0000 (18:32 +0000)]
am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
f6b609872c3a1dc3cb34e8eb78641df3a9dbc29b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:32:06 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE"
OSDN Git Service
