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

8799 Commits

Author SHA1 Message Date
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
Jason Monk
6e20cd86b2 resolve merge conflicts of 4038f15 to master 
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
 2016-03-30 12:58:09 -04: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
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
26e63245a5 Merge "Improve notes on "Opening links" and related strings" into nyc-dev am: dafc5df 
am: 87df81e

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

Change-Id: Ie65e034563031099a8b7e91d745c3b7f8141a70f
 2016-03-30 00:42:53 +00: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
854823acc7 Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev am: a859441 
am: 92ab671

* commit '92ab671167cb8022e0da07c48ab53cd4dd67dab1':
  Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339

Change-Id: I724a7b9488dfb4cd355402d4e4855b2cacd8878b
 2016-03-29 22:07:02 +00: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
347888f094 Merge "Remove VPN Overflow menu" into nyc-dev am: 2037876 
am: 24ac9d9

* commit '24ac9d93ca792b8081b745deb8a3a32f0dd30ef5':
  Remove VPN Overflow menu

Change-Id: Iae3c768d4a4891c9e4413502225c44014bacaf0b
 2016-03-29 19:02:42 +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
d75122bb83 Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev am: 7e7f82a 
am: 77a9f6f

* commit '77a9f6f2bd8e72d1c161a4eab4c43c8c1854e7f2':
  Changes SetupRedactionInterstitial to be an optional step
 2016-03-28 22:41:28 +00:00
Ajay Nadathur
5996c63e4d Merge "NPE on "Nexus Imprint"" into nyc-dev am: 69a97d7 
am: b5ae28d

* commit 'b5ae28d84c8115ca528610a8aace2b8af24830af':
  NPE on "Nexus Imprint"
 2016-03-28 22:41:25 +00:00
Anna Galusza
39936ec7bb Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev am: 8870706 
am: 4065586

* commit '4065586a29e70702351eece01a7955502b14dd35':
  Fix padding on Font size and Display size preview screens. Bug: 27675989
 2016-03-28 22:41:18 +00: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
Fan Zhang
7d18401a14 Merge "Add a DashboardContainerFragment to host DashboardSummary." 2016-03-28 17:51:40 +00:00
Fan Zhang
94df695453 Add a DashboardContainerFragment to host DashboardSummary. 
Eventually the container fragment will host more dashboard-type
fragments. For now it's just DashboardSummary.

Change-Id: I217ad71c2f2bbc4b7247c9dd2c3c2b8c8660d945
 2016-03-28 09:35:14 -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
Geoff Mendal
1a57473dde Import translations. DO NOT MERGE 
Change-Id: I8303e337afd764231eb307766b38e08b766d8f7a
Auto-generated-cl: translation import
 2016-03-28 06:33:52 -07:00
Bill Yi
6d7f9f20ca Merge "Import translations. DO NOT MERGE" 2016-03-26 17:26:30 +00:00