Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,387 Commits 1 Branch 0 Tags
a37aca16ea7808ae21b850c0b957d19e10c9d50f
Commit Graph

11169 Commits

Author SHA1 Message Date
Jason Monk
a37aca16ea Merge "Fix missing summaries" into nyc-dev am: 8143d2a 
am: f3a5f79

* commit 'f3a5f7986d41f126d6589296b207285247fb4f8e':
  Fix missing summaries

Change-Id: I6dc00e18687f801a23e12204b7627935bbc90e74
 2016-03-31 18:10:30 +00:00
Jason Monk
f3a5f7986d Merge "Fix missing summaries" into nyc-dev 
am: 8143d2a

* commit '8143d2adb345aefafdaa38ed12ab86b1a5fb0574':
  Fix missing summaries

Change-Id: Ibaaf35f6a429220a8e34621dcf16c4396044c5c5
 2016-03-31 18:04:19 +00:00
Jason Monk
8143d2adb3 Merge "Fix missing summaries" into nyc-dev 2016-03-31 18:00:55 +00:00
Jason Monk
c064573265 Fix missing summaries 
Handle non-cached tiles by doing lookup from component name.

Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes: 27942733
 2016-03-31 13:59:46 -04:00
mariagpuyol
e22810e71a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev am: 6d6ea3f 
am: d0ba082

* commit 'd0ba082ca732b0effe15067d93b22e292a96237c':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Idbb6fc5505039055825f8118cad1277966c29ae3
 2016-03-31 17:46:39 +00:00
Victor Chang
fc20972456 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am: b1d7142 
am: 5cffb81

* commit '5cffb81f567009e589e2bbc8ccd3dcae15147f13':
  Show notification when failing to turn on always-on vpn

Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
 2016-03-31 17:46:38 +00:00
mariagpuyol
d0ba082ca7 Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev 
am: 6d6ea3f

* commit '6d6ea3fe0a9aae6159b3eda197cd1d660135c413':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Ifc596101c4392bb76f2d6038c364560ebc42fefa
 2016-03-31 17:44:34 +00:00
Victor Chang
5cffb81f56 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
 2016-03-31 17:44:34 +00:00
Maria Garcia Puyol
6d6ea3fe0a Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev 2016-03-31 17:38:56 +00:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Jason Monk
38587c61fb Merge "Fix cell data preference in single sim case" into nyc-dev am: 04f10a5 
am: e0ec32c

* commit 'e0ec32c26e580b5dca8c1968f20949021d37211f':
  Fix cell data preference in single sim case

Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086
 2016-03-31 15:50:46 +00:00
Jason Monk
6de2d0a5a3 Merge changes from topic \'SettingsMetrics\' into nyc-dev am: 50b9592 
am: 5c4e4bc

* commit '5c4e4bcb63bcf01907a0b871b4793a029ddb1968':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: Ic33116cf8ef78094a026ef61514019769e44e674
 2016-03-31 15:50:44 +00:00
Jason Monk
e0ec32c26e Merge "Fix cell data preference in single sim case" into nyc-dev 
am: 04f10a5

* commit '04f10a5eb53bb1ed3d70574102b94b17e075132d':
  Fix cell data preference in single sim case

Change-Id: I08d74e06819a2d0487149af5bfa40a6124b3100c
 2016-03-31 15:43:28 +00:00
Jason Monk
5c4e4bcb63 Merge changes from topic \'SettingsMetrics\' into nyc-dev 
am: 50b9592

* commit '50b9592e6116f8a6eca5df2753491a7e26ffde6a':
  Add metrics for suggestions
  Add metrics for settings conditionals

Change-Id: I40b107005c6a29a010658de643eb94db769ebcb1
 2016-03-31 15:43:27 +00:00
Victor Chang
1b8855b211 Show notification when failing to turn on always-on vpn 
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
  (Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)

Bug:27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
 2016-03-31 16:40:22 +01:00
Jason Monk
04f10a5eb5 Merge "Fix cell data preference in single sim case" into nyc-dev 2016-03-31 13:56:51 +00:00
Jason Monk
b0bca3c3c1 Fix cell data preference in single sim case 
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes: 27653690
 2016-03-31 09:55:25 -04:00
Jason Monk
50b9592e61 Merge changes from topic 'SettingsMetrics' into nyc-dev 
* changes:
  Add metrics for suggestions
  Add metrics for settings conditionals
 2016-03-31 13:47:32 +00:00
Yohei Yukawa
a255b96253 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev am: 5ffbf2e 
am: b5164e0

* commit 'b5164e04a3b64af95fa3bbfd17d51e26b0a12247':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: I8bd9ab786944093f6047f38ee4b3611b5c4211b6
 2016-03-31 06:24:27 +00:00
Yohei Yukawa
b5164e04a3 Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
am: 5ffbf2e

* commit '5ffbf2e39d8ce5bb4f1256564fe060534541c710':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
 2016-03-31 06:21:39 +00:00
Yohei Yukawa
5ffbf2e39d Merge changes Ieea9a13a,Id2ae6151 into nyc-dev 
* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".
 2016-03-31 06:13:54 +00:00
Noah Wang
27e624829c Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev am: ca1abaa 
am: 52e0b82

* commit '52e0b820c3e172bdd6128192230aafdad1a8084b':
  Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946

Change-Id: Iafb31dcff999d813bd10d9147d242a2fb0d72e0e
 2016-03-31 02:15:34 +00:00
Noah Wang
52e0b820c3 Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev 
am: ca1abaa

* commit 'ca1abaa9531523d413830f6763963450ba494f8f':
  Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946

Change-Id: I885d01786f73ad794e4e1793390f7dd826b695e9
 2016-03-31 02:13:07 +00:00
mariagpuyol
6ca8940880 Use same task for Settings>Users and EmergencyInfo 
Bug:27859534
Change-Id: I0ea4e56e4f6daacfd478336444aceeb84d8bfe5d
 2016-03-30 18:21:48 -07:00
Noah Wang
ca1abaa953 Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev 2016-03-31 00:37:02 +00:00
Noah Wang
a0c429a1b6 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am: 74df3ec 
am: 3859720

* commit '38597204cb0a77fb05a1b4d51386db10842d8520':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: I6d180d1d44799046fadbbde7f2f4a743bf1762cc
 2016-03-30 21:53:05 +00:00
Noah Wang
38597204cb Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 
am: 74df3ec

* commit '74df3ec00247ea18ccf43c466e26dfe1a4622162':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: Ieb2a3374987ae69f8305aa0b03a94f907d4a4061
 2016-03-30 21:48:50 +00:00
Anna Galusza
8054164f98 Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev am: d2a686f 
am: 1b48ca5

* commit '1b48ca589b967725339c16eaeabce33cb8213b99':
  Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406

Change-Id: Ib0ebaa392d37cd343ca8bf6338c9abaa467bac51
 2016-03-30 21:48:48 +00:00
Anna Galusza
1b48ca589b Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev 
am: d2a686f

* commit 'd2a686fbc21959d8324e03c87ec106aa0583e912':
  Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406

Change-Id: Ia2e96a42b719a4dfe9bff8f59ae0b2a183170a45
 2016-03-30 21:43:40 +00:00
Noah Wang
74df3ec002 Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev 2016-03-30 21:41:42 +00:00
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
4cb667f036 Merge "Don\'t prompt twice to uninstall updates" into nyc-dev am: 8df0415 
am: 251b5a9

* commit '251b5a9a63f7b8144f9b04dc3bc595a0599c5fc3':
  Don't prompt twice to uninstall updates

Change-Id: I869bf5c84fadb15c8365dcc1b3252bebb795adc2
 2016-03-30 20:57:19 +00: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
9c30c2a76e Merge "Fix wifi animation issues" into nyc-dev am: b9b1c08 
am: a3ceb5a

* commit 'a3ceb5ab5665557ce7213c0ab89c7cdb7e49a9d9':
  Fix wifi animation issues

Change-Id: I188c7e981bf18f7e7a163e2edfc85b1c50082b74
 2016-03-30 20:38:04 +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
dd114078f4 Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev am: 1f361c2 
am: 2a488fc

* commit '2a488fc54010a827082de2aa3d4308ab9ddbf30f':
  Wait for fingerprints to be removed (Partial fix).

Change-Id: I5f08ac6701ec12f4329e1974dd4acc15661f2966
 2016-03-30 20:17:33 +00: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
1589002d97 Merge "Only show enabled/disabled filters in main app list" into nyc-dev am: 800c912 
am: 99d3d5c

* commit '99d3d5ccf2ab7d7acfab7d6ee1af7818edccd624':
  Only show enabled/disabled filters in main app list

Change-Id: I11bcdc9761574e853bb930fc946ec3877ea81014
 2016-03-30 19:28:16 +00: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
7681482f6d Merge "Fix bridged app list saved scroll state" into nyc-dev am: a9537a5 
am: df22fc5

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

Change-Id: I31e6244f057306306fd66af003fcb1cc1380bb98
 2016-03-30 17:48:27 +00:00