Commit Graph

8773 Commits

Author SHA1 Message Date
Rachel Zhang
0050ac0bb7 Add suggestion carousel view and dependencies to settings
Bug: 27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
2016-03-31 14:12:26 -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
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
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
Bill Yi
d2ec0e5219 Import translations. DO NOT MERGE
Change-Id: I7bc995d474f548d4628f0b73991a1c8b181f0d45
Auto-generated-cl: translation import
2016-03-25 23:52:45 -07:00
Christopher Tate
7b55a383aa Call it "Opening links" now am: 13d79b2
am: 8d5561f

* commit '8d5561fc3e54138886e7ee76911df3f9c3f3cf99':
  Call it "Opening links" now
2016-03-26 00:19:38 +00: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
d29d40e822 Merge "Move DensityUtils into SettingsLib" into nyc-dev am: 30dbd47
am: 447bb2f

* commit '447bb2f7dad8133f1f18e1f3b627affda6e4bdfe':
  Move DensityUtils into SettingsLib
2016-03-25 20:10:07 +00: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
Udam Saini
fc76f5ffd4 Merge "Updates spacing on redaction interstitial" into nyc-dev am: 375b981
am: f7e45a7

* commit 'f7e45a7f281a399ed373d6aac892d63941be33de':
  Updates spacing on redaction interstitial
2016-03-24 22:45:00 +00:00
Udam Saini
f7e45a7f28 Merge "Updates spacing on redaction interstitial" into nyc-dev
am: 375b981

* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
  Updates spacing on redaction interstitial
2016-03-24 22:40:16 +00:00
Udam Saini
375b981267 Merge "Updates spacing on redaction interstitial" into nyc-dev 2016-03-24 22:20:10 +00:00
Udam Saini
dd05ab7600 Changes SetupRedactionInterstitial to be an optional step
We no longer need this to be in inside the setup flow when setting up
the lock screen. Move this class to be used as an optional step if a
lock screen is added.

bug:23893721
Change-Id: I15478e0f0d8d8771cbdce6ccf0f508cbd5dd4f36
2016-03-24 15:08:19 -07:00
Hall Liu
b8eb4a1c55 Merge "Add indicator for system dialer in Settings" into nyc-dev am: f3dc18b
am: 736afac

* commit '736afac6cbfdc2f96fc074afbc6f25f5243fba42':
  Add indicator for system dialer in Settings
2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb Merge "Add indicator for system dialer in Settings" into nyc-dev
am: f3dc18b

* commit 'f3dc18b65bd78d7f00b6255208864cb6899674bc':
  Add indicator for system dialer in Settings
2016-03-24 17:39:30 +00:00
Hall Liu
f3dc18b65b Merge "Add indicator for system dialer in Settings" into nyc-dev 2016-03-24 17:29:39 +00:00
Yorke Lee
fe803a7be4 Merge "Fix build" into nyc-dev am: d0f8d92
am: abe553e

* commit 'abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
  Fix build
2016-03-23 18:55:10 +00:00
Yorke Lee
abe553ed0d Merge "Fix build" into nyc-dev
am: d0f8d92

* commit 'd0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
  Fix build
2016-03-23 18:47:58 +00:00
Udam Saini
ec0baa9701 Updates spacing on redaction interstitial
Cleans up the look and feel on the redaction interstitial page

bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
2016-03-23 11:29:15 -07:00
Yorke Lee
d0f8d9257b Merge "Fix build" into nyc-dev 2016-03-23 18:17:58 +00:00
Yorke Lee
d448522a6f Fix build
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
2016-03-23 11:11:46 -07:00
Sudheer Shanka
7d1fe37af9 Merge "Add more policy transparency for wifi settings." into nyc-dev am: ed0d4dd
am: add53df

* commit 'add53dfcb1eec18615610a632493fb591f924170':
  Add more policy transparency for wifi settings.
2016-03-23 18:10:59 +00:00
Sudheer Shanka
97c891b8ee Merge "Add disabled by policy empty views to more screens." into nyc-dev am: 561a88c
am: 9ddc14e

* commit '9ddc14e7c72f4deb89c904efd2f57608c4da78ab':
  Add disabled by policy empty views to more screens.
2016-03-23 18:10:58 +00:00
Sudheer Shanka
add53dfcb1 Merge "Add more policy transparency for wifi settings." into nyc-dev
am: ed0d4dd

* commit 'ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
  Add more policy transparency for wifi settings.
2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7 Merge "Add disabled by policy empty views to more screens." into nyc-dev
am: 561a88c

* commit '561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
  Add disabled by policy empty views to more screens.
2016-03-23 18:06:21 +00:00