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
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
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
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
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
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
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
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
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
Noah Wang
f6df3bcc58
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev am: 1308bd8
...
am: 825b050
* commit '825b0506ff116f850ca81758700281da2b248b8f':
Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035
Change-Id: I4ef8fea79b756cc902415c456b6c850c18f4eb15
2016-03-30 20:10:47 +00:00
Noah Wang
277081a3f5
Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev am: bcf590c
...
am: 88bb01d
* commit '88bb01d96f0a955a8366a7610363f959e2f71d8d':
Set minimum height for preview screen of font/display size settings Bug: 27699996
Change-Id: I57d61b0fffc8e4425e9d2348917d5aa385e1546b
2016-03-30 20:10:46 +00:00
Noah Wang
825b0506ff
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev
...
am: 1308bd8
* commit '1308bd8bb1f1223c57a867246542ec22d7f9ef53':
Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035
Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
2016-03-30 20:06:33 +00:00
Noah Wang
88bb01d96f
Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev
...
am: bcf590c
* commit 'bcf590c88ad07865f20e5b1500f3815c03a32cb9':
Set minimum height for preview screen of font/display size settings Bug: 27699996
Change-Id: I2875bbb371f8426aac82b13c8be871476cc43200
2016-03-30 20:06:33 +00:00
Noah Wang
1308bd8bb1
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev
2016-03-30 20:03:38 +00:00
Noah Wang
bcf590c88a
Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev
2016-03-30 20:03:13 +00:00
Jason Monk
d39dee89cb
Merge "Fix keywords for default home app" into nyc-dev am: c6aa18b
...
am: 22e2ee8
* commit '22e2ee8638a057b5fe6e1683b4b3d3e02fd60210':
Fix keywords for default home app
Change-Id: I7e1efd4a23a8c1b9db50ab254e792b184d17acfb
2016-03-30 19:28:16 +00:00
Jason Monk
22e2ee8638
Merge "Fix keywords for default home app" into nyc-dev
...
am: c6aa18b
* commit 'c6aa18bcd96ba5085153ad46bcf187dfe3c009f5':
Fix keywords for default home app
Change-Id: I5dcdafcba6be8549d8ee874b131d99532959adbb
2016-03-30 19:21:44 +00:00
Jason Monk
c6aa18bcd9
Merge "Fix keywords for default home app" into nyc-dev
2016-03-30 19:11:18 +00:00
Jason Monk
d2c753f0fb
Fix keywords for default home app
...
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes: 27826745
2016-03-30 15:09:20 -04:00
Yohei Yukawa
611410a8c4
Update title to "Add or edit virtual keyboards".
...
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.
Bug: 27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
2016-03-30 11:40:30 -07:00
Jason Monk
6e20cd86b2
resolve merge conflicts of 4038f15
to master
...
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
2016-03-30 12:58:09 -04: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
36b12b7e63
Merge "Revert "Rename more to other networks"" into nyc-dev am: fd91887
...
am: 79a6273
* commit '79a6273c314ead12890a43dba7fd5287614ed35b':
Revert "Rename more to other networks"
Change-Id: I5d9f42aceab52dc108e6141e92bf629f440f6441
2016-03-30 16:39:51 +00:00
Jason Monk
aafabbabab
Merge "Fix sim pin settings" into nyc-dev
2016-03-30 16:36:26 +00:00
Jason Monk
79a6273c31
Merge "Revert "Rename more to other networks"" into nyc-dev
...
am: fd91887
* commit 'fd918873110586911ea7dd3cab526088114fed7e':
Revert "Rename more to other networks"
Change-Id: I022c8d2570b1c6d1e9ce58328048e4354e2114ae
2016-03-30 16:35:49 +00:00
Jason Monk
fd91887311
Merge "Revert "Rename more to other networks"" into nyc-dev
2016-03-30 16:31:34 +00:00
Yohei Yukawa
07e37d01af
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev am: d719ae8
...
am: b23838b
* commit 'b23838b3792523862a0cba582b3256b6d52dd5f0':
Use word "languages" in favor of multi-locale support.
Change-Id: I9337e0ae6710d45a267663b2bb1ce48bc81d80b3
2016-03-30 16:25:17 +00:00
Jason Monk
5b39710e6d
Fix sim pin settings
...
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Clara Bayarri
3842cf1a3f
Change Work Challenge background image
...
As requested by UX
Bug: 27829562
Change-Id: Ib893dca102cdccf46102fa45e3501d43fd17b558
2016-03-30 14:57:58 +01:00
Yohei Yukawa
b23838b379
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
...
am: d719ae8
* commit 'd719ae8e37345f2e789d4a30932f3bfd9334817a':
Use word "languages" in favor of multi-locale support.
Change-Id: I8c4a4abe8f4e6c1ec959b7c59efa555b3e0436cb
2016-03-30 06:09:04 +00:00
Yohei Yukawa
d719ae8e37
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
2016-03-30 06:00:24 +00:00
Noah Wang
a8ef32b969
Adding contentDescription to ViewPager in font/display size settings.
...
Bug: 27326035
Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
2016-03-29 21:32:18 -07:00