Mihai Nita
0a7d2f8a1a
Merge "Fix locale reorder jank" into nyc-dev
...
am: 0189850
* commit '018985064d938b36c125ac1bdac73a9208e5da9f':
Fix locale reorder jank
Change-Id: I97c86470f1530f5b3da130ce22631cf1d6a186c0
2016-03-30 00:28:53 +00:00
Chris Tate
dafc5df280
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
2016-03-30 00:13:59 +00:00
Christopher Tate
1e230cb1b8
Improve notes on "Opening links" and related strings
...
Bug 27857777
Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
2016-03-29 17:09:41 -07:00
Mihai Niță
018985064d
Merge "Fix locale reorder jank" into nyc-dev
2016-03-29 23:33:21 +00:00
Udam Saini
5a1dbf8152
Wait for fingerprints to be removed (Partial fix).
...
This is a partial fix for b/27903189.
When we remove the lock screen and remove all fingerprints, wait for
them to all be removed before finishing the activity. This will let
the security screen accurately show how many fingerprints are available.
bug:27903189
Change-Id: I30908dbefb7a858f6d99e532841ed4ff894bfe62
2016-03-29 15:12:44 -07:00
Noah Wang
92ab671167
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev
...
am: a859441
* commit 'a85944104c6fe22947387d0ced613e07f6251d40':
Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339
Change-Id: I6ad269c28c04404d27f0050600e48cc68c11a061
2016-03-29 22:00:56 +00:00
Noah Wang
a85944104c
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev
2016-03-29 21:56:14 +00:00
Udam Saini
429f75bd8d
Merge "Fixes back button on action bar on some fragments." into nyc-dev
...
am: 2b1d00b
* commit '2b1d00bf22a3d0c8596e15b7b20c3e1fa65d7abd':
Fixes back button on action bar on some fragments.
Change-Id: Id03745d3178e6c6b15e1fc0d9fdc18c4f4bf6184
2016-03-29 19:51:58 +00:00
Udam Saini
2b1d00bf22
Merge "Fixes back button on action bar on some fragments." into nyc-dev
2016-03-29 19:42:27 +00:00
Victor Chang
24ac9d93ca
Merge "Remove VPN Overflow menu" into nyc-dev
...
am: 2037876
* commit '2037876888db8a33b28cf5f876b5e47deec0da72':
Remove VPN Overflow menu
Change-Id: I248091e385321e75df345e4f5aab938a5fcec166
2016-03-29 18:59:46 +00:00
Victor Chang
2037876888
Merge "Remove VPN Overflow menu" into nyc-dev
2016-03-29 18:51:33 +00:00
Udam Saini
0708d9e119
Fixes back button on action bar on some fragments.
...
SettingsPreferenceFragment has this already set so that the drawer
layout will work when the menu doesn't exist. However, some fragments
are not preference fragments, and we need to set setHasOptionsMenu
manually.
bug:27879503
Change-Id: I6faadeb56dab00af611ac413109800822038c66d
2016-03-29 10:29:14 -07:00
Jason Monk
2c1bfe37c1
Merge "Fix crash when clearing preference screen" into nyc-dev
...
am: 2c313f0
* commit '2c313f0e934c0e669b8c21519bb70eb5639b7a97':
Fix crash when clearing preference screen
Change-Id: I6446500ce33534f7cc28c9b1431adc20b5723f71
2016-03-29 17:27:14 +00:00
Jason Monk
2c313f0e93
Merge "Fix crash when clearing preference screen" into nyc-dev
2016-03-29 17:23:32 +00:00
Jason Monk
1cb12bbd60
Fix crash when clearing preference screen
...
Bug: 27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
2016-03-29 13:21:48 -04:00
Jason Monk
4a0575081c
Revert "Rename more to other networks"
...
Bug: 27638488
This reverts commit 34ed8a243b
.
Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc
2016-03-29 17:12:56 +00:00
Udam Saini
73ce947682
Merge "Prevents drawer menu from showing depending on intent." into nyc-dev
...
am: 11cd08a
* commit '11cd08a2130d9434d3b90bb5cdf1f631d4a17981':
Prevents drawer menu from showing depending on intent.
Change-Id: I0977e0d831ec702053502bfcdfe3b1c4da6ce375
2016-03-29 16:58:26 +00:00
Udam Saini
11cd08a213
Merge "Prevents drawer menu from showing depending on intent." into nyc-dev
2016-03-29 16:54:23 +00:00
Fyodor Kupolov
5d8cac2391
Merge "Disable Add user until Setup prompt is shown" into nyc-dev
...
am: 5b469f6
* commit '5b469f6a7366f6ca90252d9a8d84600bcf8fb8e1':
Disable Add user until Setup prompt is shown
Change-Id: Ica621c8a25d6c521ec5ee2cf271db8f104e49fea
2016-03-29 16:49:44 +00:00
Fyodor Kupolov
5b469f6a73
Merge "Disable Add user until Setup prompt is shown" into nyc-dev
2016-03-29 16:45:59 +00:00
Victor Chang
6005aefd44
Remove VPN Overflow menu
...
- Move always-on option for legacy vpn into the legacy vpn config page
- This implementation doesn't show dialogue when replacing existing always-on vpn
- Continue to disable lockdown option for legacy vpn when "persist.radio.imsregrequired" is true.
Not applying to vpn app
- Force to save account info when legacy vpn is always-on
- When legacy vpn is always-on, don't try to connect. (Otherwise, an exception is thrown)
TODO: Remove EXTRA_PICK_LOCKDOWN in LockdownVpnTracker in framework
Bug: 26950700
Change-Id: Ia80669359c0b7cdb955c84937156c020ac6e9af5
2016-03-29 17:28:36 +01:00
Daniel U
f9d23d94f1
Merge "Override device lock pattern visibility when unifying" into nyc-dev
...
am: f19001f
* commit 'f19001f2c0517b478dd07feb9b7427a1b506adb1':
Override device lock pattern visibility when unifying
Change-Id: I3a73cc8ad0edb8f87f20043107fb23c3ce70cc10
2016-03-29 09:40:51 +00:00
Daniel U
f19001f2c0
Merge "Override device lock pattern visibility when unifying" into nyc-dev
2016-03-29 09:34:05 +00:00
Pierre Imai
1c96ec166c
Prevent multicast addresses in static Wifi config.
...
am: 47f67c1
* commit '47f67c1ff783422fa799128eb8f1215018855b26':
Prevent multicast addresses in static Wifi config.
Change-Id: I448e43e43e2c87480e9a1027338d8d911d96bb84
2016-03-29 08:44:22 +00:00
Pierre Imai
47f67c1ff7
Prevent multicast addresses in static Wifi config.
...
Change-Id: I1961b10d67d322fb863620813fe9039b63bb7895
2016-03-29 16:04:47 +09:00
Noah Wang
863c595262
Replace "A" icon with underline with simple "A" icon on font size
...
settings screen
Bug: 27694339
Change-Id: I56c3b2bbaec36022730a8d392531f9e13d612184
2016-03-28 20:18:31 -07:00
Fyodor Kupolov
fe6cb6dac7
Disable Add user until Setup prompt is shown
...
Bug: 27848426
Change-Id: Ibbc0ac0aad8298252dfc460a10a87955fc3e713d
2016-03-28 16:44:51 -07:00
Udam Saini
92779ce701
Prevents drawer menu from showing depending on intent.
...
When ChooseLockScreenGeneric is started via the set password
intents, it should not allow the drawer menu to show.
bug:26288300
Change-Id: I10d512e20fedab2be8c725c7d524db0c55666590
2016-03-28 16:43:57 -07:00
Udam Saini
77a9f6f2bd
Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev
...
am: 7e7f82a
* commit '7e7f82acf5e0ac9cfbef6016c53a3faf5d2a722d':
Changes SetupRedactionInterstitial to be an optional step
2016-03-28 22:33:41 +00:00
mariagpuyol
9860d64025
Merge "Add flags to emergency info intent" into nyc-dev
...
am: cd1dd62
* commit 'cd1dd62420cacb5e234b86f24aaba277ad7e9095':
Add flags to emergency info intent
2016-03-28 22:33:40 +00:00
Ajay Nadathur
b5ae28d84c
Merge "NPE on "Nexus Imprint"" into nyc-dev
...
am: 69a97d7
* commit '69a97d7f5dff23a3ba26844abcad08416e4b13df':
NPE on "Nexus Imprint"
2016-03-28 22:33:39 +00:00
Sandeep Gutta
4daefb4a4a
Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev
...
am: fb40fa4
* commit 'fb40fa4aad2360bc9ec102e1d55ecbb3f1139591':
Telephony(MSIM): Fix Cellular Data Preference
2016-03-28 22:33:38 +00:00
Joe Onorato
3873f8e7cc
Merge "Adapt to procstats classes which moved." into nyc-dev
...
am: 25b5d98
* commit '25b5d98a74cb09d02b8149eb1cb60803c4562185':
Adapt to procstats classes which moved.
2016-03-28 22:33:36 +00:00
Anna Galusza
4065586a29
Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev
...
am: 8870706
* commit '8870706614da8244c20dc46b53376422a819a61f':
Fix padding on Font size and Display size preview screens. Bug: 27675989
2016-03-28 22:33:35 +00:00
Anna Galusza
39153117f0
Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev
...
am: 65e940b
* commit '65e940b8c13a0a89c80cf1b83c2cd946ad2b9552':
Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572
2016-03-28 22:33:33 +00:00
Anna Galusza
eff771423e
Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev
...
am: c53f337
* commit 'c53f3374436ec01653a57722f709f36bfa431c5d':
Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766
2016-03-28 22:33:30 +00:00
Udam Saini
7e7f82acf5
Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev
2016-03-28 22:06:59 +00:00
Maria Garcia Puyol
cd1dd62420
Merge "Add flags to emergency info intent" into nyc-dev
2016-03-28 21:56:59 +00:00
mariagpuyol
bd5c83f8b9
Add flags to emergency info intent
...
Bug:27859534
Change-Id: I3ff0aea7b0115a22c0a4a853d8fc83a7ae7adc20
2016-03-28 14:49:38 -07:00
Ajay Kumar Nadathur Sreenivasan
69a97d7f5d
Merge "NPE on "Nexus Imprint"" into nyc-dev
2016-03-28 21:08:27 +00:00
Robb Glasser
fb40fa4aad
Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev
2016-03-28 21:06:40 +00:00
Sandeep Gutta
c4d7823c85
Telephony(MSIM): Fix Cellular Data Preference
...
While voice call is active, if cellular data preference
updated via updateCellularDataValues(), the cellular data
preference option getting enabled.
To fix this consider the call state while updating
cellular data preference in updateCellularDataValues().
bug:27635796
Change-Id: I5306f021e8bdeecc845d50a3b55b9c07d1b2c837
2016-03-28 14:05:46 -07:00
Joe Onorato
25b5d98a74
Merge "Adapt to procstats classes which moved." into nyc-dev
2016-03-28 20:52:38 +00:00
Anna Galusza
8870706614
Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev
2016-03-28 18:14:49 +00:00
Anna Galusza
65e940b8c1
Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev
2016-03-28 18:14:37 +00:00
Anna Galusza
c53f337443
Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev
2016-03-28 18:14:18 +00:00
Ajay Nadathur
7377d4fe6b
NPE on "Nexus Imprint"
...
- When no fingerprint is setup, "Nexus Imprint" crashes because
"selectableItemBackground" is not defined. (Which is referenced by
SUW's RecyclerItemAdapter)
- Added selectableItemBackground to themes.xml
bug:27853943
Change-Id: I0e4107cf92aef5e4e3853ca45af73905d38b230e
2016-03-28 11:07:50 -07:00
Sudheer Shanka
38a266a681
Merge "Fix crash in ApnSettings." into nyc-dev
...
am: 2cfda2a
* commit '2cfda2a3bd796585c02f93dae628896ac077aa98':
Fix crash in ApnSettings.
2016-03-28 17:32:36 +00:00
Sudheer Shanka
d459e35577
Merge "Fix crash in AndroidBeam class." into nyc-dev
...
am: 2fff06e
* commit '2fff06e91816ff787dfcbaf4de3cb71f9ce91282':
Fix crash in AndroidBeam class.
2016-03-28 17:32:35 +00:00
Sudheer Shanka
2cfda2a3bd
Merge "Fix crash in ApnSettings." into nyc-dev
2016-03-28 17:18:54 +00:00