OSDN Git Service
John Spurlock [Fri, 12 Dec 2014 19:04:24 +0000 (19:04 +0000)]
am
b4805e3a: Settings: Allow more lines of saver feature description text.
* commit '
b4805e3a3481196a0e945d397bef0950a843f5a3':
Settings: Allow more lines of saver feature description text.
John Spurlock [Fri, 12 Dec 2014 17:54:48 +0000 (12:54 -0500)]
Settings: Allow more lines of saver feature description text.
Bug:
18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
Wink Saville [Fri, 12 Dec 2014 04:37:35 +0000 (04:37 +0000)]
am
8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
* commit '
8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Wink Saville [Fri, 12 Dec 2014 04:23:16 +0000 (04:23 +0000)]
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Prem Kumar [Fri, 12 Dec 2014 00:59:34 +0000 (00:59 +0000)]
am
96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
* commit '
96ca2cfd087078e4042f9ab9678c77dea136eefe':
Clearing junk layout for add wifi dialog in settings.
Prem Kumar [Fri, 12 Dec 2014 00:52:31 +0000 (00:52 +0000)]
Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
Sanket Padawe [Thu, 11 Dec 2014 23:48:45 +0000 (15:48 -0800)]
Clearing junk layout for add wifi dialog in settings.
Bug:
18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
Wink Saville [Thu, 11 Dec 2014 18:10:05 +0000 (10:10 -0800)]
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 15:09:56 +0000 (15:09 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
automerge:
25a1181
* commit '
25a1181f2a61d32481e7c66f96c2abf7aebd761e':
Bring up correct app for Recent location list items
PauloftheWest [Thu, 11 Dec 2014 15:09:31 +0000 (15:09 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
automerge:
209c946
* commit '
209c9465b3251c0a5e652214e402b1a54df234f9':
Disabled SIM notifications while provisioning.
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 13:23:28 +0000 (13:23 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
PauloftheWest [Thu, 11 Dec 2014 13:14:06 +0000 (13:14 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
PauloftheWest [Wed, 10 Dec 2014 21:54:50 +0000 (13:54 -0800)]
Disabled SIM notifications while provisioning.
Bug:
18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
PauloftheWest [Wed, 10 Dec 2014 21:24:59 +0000 (21:24 +0000)]
am
ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
* commit '
ab88ad9381dda4afe59d00966cb783426f5f44a3':
Fixed a Data Usage crash
PauloftheWest [Wed, 10 Dec 2014 21:16:10 +0000 (21:16 +0000)]
Merge "Fixed a Data Usage crash" into lmp-mr1-dev
Alexandra Gherghina [Wed, 10 Dec 2014 17:47:14 +0000 (17:47 +0000)]
am
32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
* commit '
32ca6f1fbf2b9698afe99ad387580b38d07b50ca':
Fix NPE in Running Processes view in Apps Settings
Alexandra Gherghina [Wed, 10 Dec 2014 17:42:41 +0000 (17:42 +0000)]
Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
PauloftheWest [Wed, 10 Dec 2014 16:50:54 +0000 (08:50 -0800)]
Fixed a Data Usage crash
Bug:
18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
Emily Bernier [Wed, 10 Dec 2014 17:34:53 +0000 (17:34 +0000)]
am
5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
* commit '
5a528b274f010c2aec5f188c620fabf674aa2637':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
Emily Bernier [Wed, 10 Dec 2014 17:25:14 +0000 (17:25 +0000)]
Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 14:47:31 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 10 Dec 2014 14:39:51 +0000 (06:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3101f0a9a789a2cb20115e66f88ca96374594888
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 14:37:23 +0000 (14:37 +0000)]
am
26b04765: (-s ours) Import translations. DO NOT MERGE
* commit '
26b0476586b736c25ddbe0c5f39793c5e5633a67':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 14:24:00 +0000 (06:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
Alexandra Gherghina [Tue, 9 Dec 2014 17:06:39 +0000 (17:06 +0000)]
Fix NPE in Running Processes view in Apps Settings
Bug:
18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
Maurice Lam [Wed, 10 Dec 2014 01:22:29 +0000 (01:22 +0000)]
Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
automerge:
e0f637a
* commit '
e0f637a66b9dbaaec80ef36c52a96fbb65735790':
[FRP] Shrink lock screen when keyboard pops up
Maurice Lam [Wed, 10 Dec 2014 01:17:14 +0000 (01:17 +0000)]
Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
Emily Bernier [Wed, 10 Dec 2014 01:02:41 +0000 (20:02 -0500)]
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.
Bug:
18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
PauloftheWest [Tue, 9 Dec 2014 23:17:50 +0000 (23:17 +0000)]
am
aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
* commit '
aa800609304b4787091b1805b2439423b3192bb1':
Added Multi-SIM capability to Access Point Names
PauloftheWest [Tue, 9 Dec 2014 23:12:52 +0000 (23:12 +0000)]
am
e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
* commit '
e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
Fixed a SIM Lock UI issue
PauloftheWest [Tue, 9 Dec 2014 23:10:35 +0000 (23:10 +0000)]
Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
PauloftheWest [Tue, 9 Dec 2014 23:04:18 +0000 (23:04 +0000)]
Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
Zoltan Szatmary-Ban [Tue, 9 Dec 2014 19:20:21 +0000 (19:20 +0000)]
Bring up correct app for Recent location list items
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.
Bug:
17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
Wink Saville [Tue, 9 Dec 2014 17:58:30 +0000 (17:58 +0000)]
am
85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
* commit '
85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
Add debug dataEnable.
Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add debug dataEnable." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 23:47:30 +0000 (15:47 -0800)]
[FRP] Shrink lock screen when keyboard pops up
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.
Bug:
18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
Prem Kumar [Tue, 9 Dec 2014 02:30:23 +0000 (02:30 +0000)]
am
1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
* commit '
1e1251cc04ee9636721719aa0a13d94e15500258':
Fixed a SIM Cards crash.
Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
John Spurlock [Tue, 9 Dec 2014 00:08:42 +0000 (00:08 +0000)]
am
1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
* commit '
1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
Settings: Rebind to volume sliders after returning from stopped.
PauloftheWest [Mon, 8 Dec 2014 21:49:35 +0000 (13:49 -0800)]
Fixed a SIM Lock UI issue
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.
Bug:
18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
John Spurlock [Mon, 8 Dec 2014 20:27:01 +0000 (20:27 +0000)]
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 20:23:34 +0000 (12:23 -0800)]
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug:
18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
John Spurlock [Mon, 8 Dec 2014 20:20:33 +0000 (15:20 -0500)]
Settings: Rebind to volume sliders after returning from stopped.
Bug:
18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
PauloftheWest [Tue, 2 Dec 2014 16:45:00 +0000 (08:45 -0800)]
Added Multi-SIM capability to Access Point Names
+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.
Bug:
18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
Jeff Sharkey [Mon, 8 Dec 2014 18:04:09 +0000 (18:04 +0000)]
am
14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '
14ff2f7c30b8258807f44afb815ccc71dc574c1c':
Offer to "merge" subscribers for data usage.
Jeff Sharkey [Mon, 8 Dec 2014 17:57:29 +0000 (17:57 +0000)]
Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:08:09 +0000 (17:08 +0000)]
am
2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
* commit '
2a56b1943f10beea189fa8ec5478981e6b704b42':
SIM cards in Setting will only show on Multi-SIM devices
PauloftheWest [Mon, 8 Dec 2014 17:08:08 +0000 (17:08 +0000)]
am
a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
* commit '
a2f699871eb01c6d8464699eb8808c33de15f438':
Fixed a SimSettings issue
PauloftheWest [Mon, 8 Dec 2014 17:01:35 +0000 (17:01 +0000)]
Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:22 +0000 (17:01 +0000)]
Merge "Fixed a SimSettings issue" into lmp-mr1-dev
John Spurlock [Mon, 8 Dec 2014 16:57:26 +0000 (16:57 +0000)]
am
f68bc645: Settings: Hide downtime settings if not supported.
* commit '
f68bc6459352cf585b2cbb1c9e0c9b54e1936daa':
Settings: Hide downtime settings if not supported.
Jeff Sharkey [Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)]
Offer to "merge" subscribers for data usage.
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.
Also remove some code related to long-dormant split policies.
Bug:
18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
John Spurlock [Sun, 30 Nov 2014 21:22:09 +0000 (16:22 -0500)]
Settings: Hide downtime settings if not supported.
Depends on frameworks/base:
I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
Bug:
16373455
Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
Geoff Mendal [Mon, 8 Dec 2014 14:42:26 +0000 (14:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 8 Dec 2014 14:41:08 +0000 (06:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib5799918393320abc01ef481068d943b716451f9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 8 Dec 2014 14:36:05 +0000 (14:36 +0000)]
am
838d6dc9: (-s ours) Import translations. DO NOT MERGE
* commit '
838d6dc94970201792bc825091c9b520fb96821a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 14:25:15 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:55:55 +0000 (12:55 +0000)]
am
f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
* commit '
f84c6ee01c09b25d78c48cdf6bde5be4e334758c':
Make Location Settings multiprofile aware
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:50:10 +0000 (12:50 +0000)]
Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 10:11:52 +0000 (10:11 +0000)]
am
07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
* commit '
071171476aeb869d40a5247e09759d7049cda239':
[FRP] Screen Lock for Setup Wizard shows wrong title
Lucky Zhang [Mon, 8 Dec 2014 10:11:50 +0000 (10:11 +0000)]
am
73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
* commit '
73ae2d3adca786efed712e088b03c520fe7e9790':
[FRP] Remove None and Swipe from screen lock options
Lucky Zhang [Mon, 8 Dec 2014 09:32:00 +0000 (09:32 +0000)]
Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:31:45 +0000 (09:31 +0000)]
Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
Maurice Lam [Sat, 6 Dec 2014 03:10:19 +0000 (03:10 +0000)]
am
400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
* commit '
400e93785016cce831b14990365ab7636b846648':
[FRP] Don't extract IME for PIN / Password during setup
Maurice Lam [Sat, 6 Dec 2014 03:03:55 +0000 (03:03 +0000)]
Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev
Lucky Zhang [Fri, 5 Dec 2014 23:00:20 +0000 (15:00 -0800)]
[FRP] Remove None and Swipe from screen lock options
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".
Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.
Bug:
18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
Lucky Zhang [Sat, 6 Dec 2014 02:20:27 +0000 (18:20 -0800)]
[FRP] Screen Lock for Setup Wizard shows wrong title
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".
Bug:
18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
Jeff Davidson [Sat, 6 Dec 2014 02:16:41 +0000 (02:16 +0000)]
am
9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
* commit '
9dc247bba248ac6329b6e0a5b42ac8ef4c8c4a3e':
Final platform settings UX for ephemeral networks.
Jeff Davidson [Sat, 6 Dec 2014 02:07:30 +0000 (02:07 +0000)]
Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
Wink Saville [Fri, 5 Dec 2014 23:34:46 +0000 (15:34 -0800)]
Add debug dataEnable.
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
Maurice Lam [Fri, 5 Dec 2014 22:12:51 +0000 (22:12 +0000)]
am
7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
* commit '
7dca460af7a6a9d683ea398c6eb2e3f784aa6900':
[FRP] Use Lock type as header instead of "Encryption"
Maurice Lam [Fri, 5 Dec 2014 21:56:59 +0000 (21:56 +0000)]
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 21:03:36 +0000 (21:03 +0000)]
am
fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
* commit '
fc988c03e11eba66ca28f6dbec6d889535638bbb':
Removing checks from EnableWifiTether which are done in SystemUI
Sanket Padawe [Fri, 5 Dec 2014 21:03:35 +0000 (21:03 +0000)]
am
6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
* commit '
6d0059c3f998a86b1726949525d3501d5b7cf589':
Change default sim selection text in sim settings ui.
Sanket Padawe [Fri, 5 Dec 2014 20:55:42 +0000 (20:55 +0000)]
Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:28 +0000 (20:55 +0000)]
Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 20:19:05 +0000 (12:19 -0800)]
[FRP] Use Lock type as header instead of "Encryption"
Bug:
18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
Justin Harrison [Fri, 5 Dec 2014 19:49:05 +0000 (19:49 +0000)]
am
0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev
* commit '
0612a48563f35a13f06c8bc1ebb8758e0bc3acc6':
Check remote device uuids for phone book access permission
Justin Harrison [Fri, 5 Dec 2014 19:41:54 +0000 (19:41 +0000)]
Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 15 Oct 2014 10:35:55 +0000 (11:35 +0100)]
Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location
Bug:
18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
Fyodor Kupolov [Fri, 5 Dec 2014 19:32:35 +0000 (19:32 +0000)]
am
d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev
* commit '
d4057cc312feca00eac73f908788799ab567d8a1':
Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
Shishir Agrawal [Fri, 5 Dec 2014 19:32:34 +0000 (19:32 +0000)]
am
0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
* commit '
0b1f606c6e79a3a891a19e88ece48d9852081714':
Settings app - read phone number from TelephonyManager.
Fyodor Kupolov [Fri, 5 Dec 2014 19:28:42 +0000 (19:28 +0000)]
Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev
Shishir Agrawal [Fri, 5 Dec 2014 19:25:59 +0000 (19:25 +0000)]
Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 19:14:01 +0000 (11:14 -0800)]
[FRP] Don't extract IME for PIN / Password during setup
Add the flagNoExtractUi to the password / PIN entry field so that it
will not be extracted to a fullscreen mode in phone landscape.
The phone landscape UI currently provides a poor experience because
it masks the message shown to the user (e.g. Passwords require at
least 4 characters)
Bug:
18640065
Change-Id: If67c8f9ae761f1ffda4f841e421e0fd651651649
Adrian Roos [Fri, 5 Dec 2014 18:32:02 +0000 (18:32 +0000)]
am
5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
* commit '
5df6e0302c242b801eee73a513ba04a79f508c2e':
Fix race leading to spuriously disabled trust agents
Adrian Roos [Fri, 5 Dec 2014 18:25:58 +0000 (18:25 +0000)]
Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:29:36 +0000 (15:29 -0800)]
Final platform settings UX for ephemeral networks.
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.
Bug:
18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
Adrian Roos [Fri, 5 Dec 2014 17:47:12 +0000 (18:47 +0100)]
Fix race leading to spuriously disabled trust agents
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.
Bug:
18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
Maurice Lam [Fri, 5 Dec 2014 03:27:17 +0000 (03:27 +0000)]
am
2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
* commit '
2c0c983755903bf9c0a5cb276c64ed7cf4557464':
[FRP] Use setup wizard nav bar buttons
Maurice Lam [Fri, 5 Dec 2014 03:21:51 +0000 (03:21 +0000)]
Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
Justin Harrison [Fri, 5 Dec 2014 02:25:42 +0000 (02:25 +0000)]
am
03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
* commit '
03cceb329366796a64cfb86b03fe0c08b06f852b':
Removed the application SIM Cards from application list
Justin Harrison [Fri, 5 Dec 2014 02:17:23 +0000 (02:17 +0000)]
Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 00:32:53 +0000 (00:32 +0000)]
am
dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
* commit '
dfaf4c92c19356116267cf9c61168414d817b9a7':
[FRP] Add illustration to lock screen setup
Maurice Lam [Fri, 5 Dec 2014 00:22:59 +0000 (00:22 +0000)]
Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 23:13:50 +0000 (23:13 +0000)]
am
13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit '
13989d6d9f25a5d09d68dfc98b31595e8e6b8425':
[FRP] Give pattern lock colors
Sanket Padawe [Thu, 4 Dec 2014 22:49:32 +0000 (14:49 -0800)]
Change default sim selection text in sim settings ui.
Bug:
18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
Maurice Lam [Thu, 4 Dec 2014 23:04:36 +0000 (23:04 +0000)]
Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 05:44:37 +0000 (21:44 -0800)]
[FRP] Give pattern lock colors
Bug:
18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
PauloftheWest [Thu, 4 Dec 2014 20:32:40 +0000 (12:32 -0800)]
Removed the application SIM Cards from application list
Bug:
18623155
Change-Id: Ic9ef449136fb6ef854727ad994976a5dc6d8ee8c