Commit Graph

27638 Commits

Author SHA1 Message Date
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
Christopher Tate
25e59e9767 Track in-progress wallpaper API changes
FLAG_*, not FLAG_SET_*

Bug 27365822

Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
2016-03-31 09:56:37 -07:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
2016-03-31 15:50:46 +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
Bill Yi
6a2cf0a28e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 645c198 -s ours
am: 987b621  -s ours

* commit '987b6211574463a3ed139373dd3e1b241dae64d5':
  Import translations. DO NOT MERGE

Change-Id: I6353e86f3630d5c063eb02adaf1dde58b744603b
2016-03-31 15:50:43 +00:00
Jason Monk
d09508b8fc Merge "Fix categeries being read out on settings dashboard" into nyc-dev
am: 69446e8

* commit '69446e80ab95f7d01b7612a02ae35e75d9b5c609':
  Fix categeries being read out on settings dashboard

Change-Id: Ifd3c3ad560969b58557acd86a98eb299d65a4385
2016-03-31 15:43:28 +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
Bill Yi
987b621157 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 645c198  -s ours

* commit '645c198f3e65427017b53957c025b0b3a94ebe52':
  Import translations. DO NOT MERGE

Change-Id: I5fd25e9853c625ce669b5ea54e2509351eed24b9
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
69446e80ab Merge "Fix categeries being read out on settings dashboard" into nyc-dev 2016-03-31 14:36:45 +00:00
Jason Monk
9c868652ba Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes: 26125682
2016-03-31 10:35:03 -04: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
Bill Yi
645c198f3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-31 13:23:37 +00:00
Bill Yi
120845909f Merge "Import translations. DO NOT MERGE" 2016-03-31 13:22:49 +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
Bill Yi
6153baa067 Import translations. DO NOT MERGE
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
2016-03-30 22:29:47 -07:00
Bill Yi
da7576261b Import translations. DO NOT MERGE
Change-Id: Ic4e77e1979b46669b31f54f2bf86f31c5f6efb67
Auto-generated-cl: translation import
2016-03-30 21:41:30 -07: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
Daichi Hirono
4bd1684321 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev am: 9856531
am: 03f89ff

* commit '03f89ff4fabd7b93d3ad7ed4df04ed88363a12cc':
  Change the dialog text in USB device tyep chooser.

Change-Id: I1a84b9946436824abd71519cd192e6262da453da
2016-03-31 00:40:42 +00: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
Daichi Hirono
03f89ff4fa Merge "Change the dialog text in USB device tyep chooser." into nyc-dev
am: 9856531

* commit '9856531b450b6bdc73f0d8f4416661c10d4560ec':
  Change the dialog text in USB device tyep chooser.

Change-Id: Ided54b1ce7d00dcdf028b1d0724eae117a0f4f64
2016-03-31 00:36:16 +00:00
Daichi Hirono
9856531b45 Merge "Change the dialog text in USB device tyep chooser." into nyc-dev 2016-03-30 23:59:05 +00:00
Mihai Nita
8adce9368b Merge "Fix missing dot in the remove language confirmation message" into nyc-dev am: 627d0af
am: 7df8853

* commit '7df885353afd6dbe8133c4f65678301ac705bf56':
  Fix missing dot in the remove language confirmation message

Change-Id: Ia729047f2606de48cab8f71696db50867f5d63f5
2016-03-30 22:52:42 +00:00
Mihai Nita
7df885353a Merge "Fix missing dot in the remove language confirmation message" into nyc-dev
am: 627d0af

* commit '627d0af541b1cc008c69db5f68a402914bd21971':
  Fix missing dot in the remove language confirmation message

Change-Id: I2bb5ca2e567adb04bb8f66a067cb71fe33c46b97
2016-03-30 22:48:29 +00:00
Mihai Niță
627d0af541 Merge "Fix missing dot in the remove language confirmation message" into nyc-dev 2016-03-30 22:37:53 +00:00
Udam Saini
71fde52ae3 Fixes graybar as status bar and unshifts header view.
StickyHeaderListView will not layout all the way to the top of the screen
if fitsSystemWindows is true.

bug:27875272
Change-Id: I4150dc183778284df2f07f3a6220e0c0b2607774
2016-03-30 15:25:59 -07:00
Mihai Nita
632a311c35 Fix missing dot in the remove language confirmation message
Bug: 27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
2016-03-30 14:55:30 -07: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
d3dcce029d Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406"
Framework bug was fixed by ag/900274, so this is no longer needed.

This reverts commit 062efd0f17.

Change-Id: I8ebfad33420d908444910a2feffa09661b0542ff
2016-03-30 21:40:01 +00:00
Udam Saini
85eebb52a8 Adds a multi line preference class.
Some preferences (namely inside the encryption interstitial) can flow
passed a single line when the font size is set to largest. We should
allow for this to extend to another line instead of using ellipsis.

bug:27875272
Change-Id: I2697ae37bfe39a4890298f82cf80fc70b93881df
2016-03-30 14:39:42 -07: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