Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,982 Commits 1 Branch 0 Tags
7df885353afd6dbe8133c4f65678301ac705bf56
Commit Graph

8624 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jason Monk
5b39710e6d Fix sim pin settings 
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
 2016-03-30 11:41:45 -04: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
Noah Wang
80a0e93c8d Set minimum height for preview screen of font/display size settings 
Bug: 27699996

Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
 2016-03-29 21:04:17 -07:00
Yohei Yukawa
c4204c3ba6 Use word "languages" in favor of multi-locale support. 
In Android N, the user is able to select multiple languages.  Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".

Bug: 27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
 2016-03-29 20:44:01 -07:00
Christopher Tate
87df81ec23 Merge "Improve notes on "Opening links" and related strings" into nyc-dev 
am: dafc5df

* commit 'dafc5df280bcd6912a06f2861f07691906ffe1c0':
  Improve notes on "Opening links" and related strings

Change-Id: I1a6c2f35174c1da55a8e83bc15ec09e370f6f515
 2016-03-30 00:28:54 +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
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
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
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
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
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
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
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
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
Udam Saini
7e7f82acf5 Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev 2016-03-28 22:06:59 +00:00
Ajay Kumar Nadathur Sreenivasan
69a97d7f5d Merge "NPE on "Nexus Imprint"" into nyc-dev 2016-03-28 21:08:27 +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
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
Geoff Mendal
ff750b5d82 Import translations. DO NOT MERGE 
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
 2016-03-28 07:42:47 -07:00
Bill Yi
2d17f93122 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-26 17:26:11 +00:00
Bill Yi
2393396422 Import translations. DO NOT MERGE 
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
 2016-03-26 00:37:09 -07:00
Christopher Tate
8d5561fc3e Call it "Opening links" now 
am: 13d79b2

* commit '13d79b2a252ac4bbb55e110782f5d166d1ed4db7':
  Call it "Opening links" now
 2016-03-26 00:16:39 +00:00
Christopher Tate
13d79b2a25 Call it "Opening links" now 
Better labels are better.

Bug 27834016

Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
 2016-03-25 15:06:25 -07:00
Alan Viverette
447bb2f7da Merge "Move DensityUtils into SettingsLib" into nyc-dev 
am: 30dbd47

* commit '30dbd47a29fb12f1a5c5027d6719397fb322fe9e':
  Move DensityUtils into SettingsLib
 2016-03-25 20:06:34 +00:00
Alan Viverette
30dbd47a29 Merge "Move DensityUtils into SettingsLib" into nyc-dev 2016-03-25 19:59:38 +00:00
Alan Viverette
6b0b73fdc4 Move DensityUtils into SettingsLib 
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
 2016-03-25 14:56:25 -04:00