Commit Graph

11159 Commits

Author SHA1 Message Date
Anna Galusza
d2a686fbc2 Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev 2016-03-30 21:39:05 +00:00
Noah Wang
abf6312b8d Make preview screens in font/display size settings scrollable
Bug: 27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
2016-03-30 14:32:32 -07:00
Amith Yamasani
251b5a9a63 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev
am: 8df0415

* commit '8df04151d0461ce1520043eb74943f67f9a74aa8':
  Don't prompt twice to uninstall updates

Change-Id: I35169cfa6a2936638309b23a76c5bcd636df6dc9
2016-03-30 20:50:43 +00:00
Amith Yamasani
8df04151d0 Merge "Don't prompt twice to uninstall updates" into nyc-dev 2016-03-30 20:43:03 +00:00
Jason Monk
a3ceb5ab56 Merge "Fix wifi animation issues" into nyc-dev
am: b9b1c08

* commit 'b9b1c083e4bd59e17e29d9b5de4b8fed0a754fb6':
  Fix wifi animation issues

Change-Id: I33fda33647e5f9f05af4c57da538836a48bc6e3c
2016-03-30 20:33:39 +00:00
Jason Monk
b9b1c083e4 Merge "Fix wifi animation issues" into nyc-dev 2016-03-30 20:24:19 +00:00
Jason Monk
85da859392 Fix wifi animation issues
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.

Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes: 26271353
2016-03-30 16:22:39 -04:00
Udam Saini
2a488fc540 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
am: 1f361c2

* commit '1f361c25e09ee07dd0babb4e7b9a8d3720f0ca31':
  Wait for fingerprints to be removed (Partial fix).

Change-Id: If4d49cc787554adf56451cff0fb7239e4dda9318
2016-03-30 20:13:18 +00:00
Udam Saini
1f361c25e0 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev 2016-03-30 20:05:45 +00:00
Jason Monk
45fda2734a Add metrics for suggestions
Bug: 27851236
Change-Id: Ia5aa1d42a40ba09a19db3c3790f0a7342660e613
2016-03-30 16:05:29 -04:00
Jason Monk
f20c718f19 Add metrics for settings conditionals
Bug: 27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
2016-03-30 15:46:26 -04:00
Jason Monk
99d3d5ccf2 Merge "Only show enabled/disabled filters in main app list" into nyc-dev
am: 800c912

* commit '800c912f7a8ade7cb9fd501c97c57bd946b4374d':
  Only show enabled/disabled filters in main app list

Change-Id: I986446866b88a744efe20102466b568f24614d54
2016-03-30 19:21:43 +00:00
Jason Monk
800c912f7a Merge "Only show enabled/disabled filters in main app list" into nyc-dev 2016-03-30 18:53:32 +00:00
Jason Monk
4a25f35680 Only show enabled/disabled filters in main app list
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes: 27921850
2016-03-30 14:51:52 -04:00
Yohei Yukawa
a9341c38e3 Remove gear icon from InputMethodPreference.
Per comment from UX, we do not show gear icons on InputMethodPreference
because there is no difference between tapping the item itself and
tapping the gear icon.

Bug: 27543291
Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1
2016-03-30 11:45:00 -07:00
Jason Monk
df22fc52a2 Merge "Fix bridged app list saved scroll state" into nyc-dev
am: a9537a5

* commit 'a9537a57d59a1b79b999655494af713048f051e9':
  Fix bridged app list saved scroll state

Change-Id: Ia28306bc196abd0764bde0e40c4dd928a5d2aafa
2016-03-30 17:44:07 +00:00
Muyuan Li
b69a359f49 Intent to start app memory usage page.
am: ba115af

* commit 'ba115afd52dea0c2db6966748d4cb3b9ff262880':
  Intent to start app memory usage page.

Change-Id: I8ab11e9ed73b668ba47752bc87a578c9237b0e35
2016-03-30 17:44:07 +00:00
Jason Monk
a9537a57d5 Merge "Fix bridged app list saved scroll state" into nyc-dev 2016-03-30 17:26:55 +00:00
Jason Monk
228638019d Fix bridged app list saved scroll state
(don't clear the list when we have the info)

Fixes: 27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
2016-03-30 13:26:30 -04:00
Muyuan Li
ba115afd52 Intent to start app memory usage page.
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.

Bug: 26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit b816812a4f68a1841703da5d29b32ccafd0896f6)
2016-03-30 17:13:22 +00:00
Amith Yamasani
bacc708f96 Don't prompt twice to uninstall updates
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.

Bug: 26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
2016-03-30 09:52:33 -07:00
Jason Monk
4038f15af3 Merge "Fix sim pin settings" into nyc-dev
am: aafabba

* commit 'aafabbabab3771b89944ea2a7aea2b4f7b8ba071':
  Fix sim pin settings

Change-Id: I26a86f87522a50933d8d7a293b1b3c9089043f4c
2016-03-30 16:43:54 +00:00
Jason Monk
5b39710e6d Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Noah Wang
c89855aef9 Fix crashing of font size settings screen due to the timing
of initialization of ExploreByTouchHelper
Bug: 27674946

Change-Id: Ief92b5db975861aa31029712854e78edf4454eb5
2016-03-29 20:28:05 -07:00
Jim Miller
d12166e411 Fix crash in ConfirmDeviceCredentials
This reverts the workaround for bug 23849216 which has since
been fixed.

Fixes bug 27138063

Change-Id: Ifab4d072d0c95bb121bf3a9d852f2b16e92b7144
2016-03-29 18:34:53 -07:00
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
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
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
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
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
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