Commit Graph

28143 Commits

Author SHA1 Message Date
TreeHugger Robot
43a4e5f4ea Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-09 18:17:36 +00:00
TreeHugger Robot
4e5641bfa8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-09 18:17:33 +00:00
Sudheer Shanka
2ad6adbd58 Add policy transparency to app notification settings on lockscreen.
Bug: 28390118
Change-Id: I395440b0f7e93da90f9f346574afa5501761d473
2016-05-09 10:57:34 -07:00
Fan Zhang
016f875ae7 Fix crash when rotating screen in a few screens.
Bug: 26946312

Fixed in the following screens:
Apps > Gear > Special Access > Modify system settings
Apps > Gear > Special Access > Draw over other apps
Apps > Gear > Special Access > Apps with usage access
Language & input > Personal dictionary
Wireless & networks (More) > Android Beam

Change-Id: I0b9bd6c19f710302625dd87989e9d4ce3c96a9a2
2016-05-09 17:56:06 +00:00
Felipe Leme
785f294d04 Added title for stand-alone App Data Usage activitiy.
Change-Id: I031085e6a3c058ed55dfdfe3e7cfecf5a21dddc5
Fixes: 28615889
2016-05-09 10:34:39 -07:00
Victor Chang
f5b2fea636 Show a different Root CA string for device owner
Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
2016-05-09 16:41:45 +01:00
Android Build Merger (Role)
30b6336d3a Merge "Merge "Dashboard performance work" into nyc-dev am: 04b25af149 am: 4a36e0b3fc" into nyc-mr1-dev-plus-aosp 2016-05-09 13:44:53 +00:00
Jason Monk
fc5f0d4d20 Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 96eedcfdd2

* commit '96eedcfdd24a0cda4a56843a55f448367e8518c8':
  Dashboard performance work

Change-Id: Ifdb7fa74850c8a4a217ed9f706b2bc3cdcad9be4
2016-05-09 13:44:38 +00:00
Jason Monk
4674a5597e Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 4a36e0b3fc

* commit '4a36e0b3fccb9ebf29582aa1eb22ba47078540ae':
  Dashboard performance work

Change-Id: I66492092477f36e46d792f2b512af25374a2273d
2016-05-09 13:44:37 +00:00
Jason Monk
4a36e0b3fc Merge "Dashboard performance work" into nyc-dev
am: 04b25af149

* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
  Dashboard performance work

Change-Id: Ib85705ab2984d6b8229181709a762dfbcf6341c0
2016-05-09 13:40:55 +00:00
Jason Monk
96eedcfdd2 Merge "Dashboard performance work" into nyc-dev
am: 04b25af149

* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
  Dashboard performance work

Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
2016-05-09 13:40:54 +00:00
Jason Monk
04b25af149 Merge "Dashboard performance work" into nyc-dev 2016-05-09 13:37:45 +00:00
Bill Yi
40225b58db Import translations. DO NOT MERGE
Change-Id: Ia72b6a7cc7ef24d407953bdfec981ac8a08d48de
Auto-generated-cl: translation import
2016-05-09 06:29:08 -07:00
Bill Yi
bb5730df59 Import translations. DO NOT MERGE
Change-Id: I6e9f10288cb94440b0f46bd5405ed996168efcbf
Auto-generated-cl: translation import
2016-05-09 06:22:15 -07:00
Felipe Leme
f62ba989bc Merge "Implemented onRestrictPowerChanged()." into nyc-dev am: f135ad5186
am: c36f19e26f

* commit 'c36f19e26f7268b642b6de96b43de7a21ad50ef0':

Change-Id: Id6c8a1505aaa049f2003208a460e7648a8f3f990
2016-05-07 05:32:59 +00:00
Jason Monk
237741a335 Merge "Fix accessibility description on master clear" into nyc-dev am: c12521cdcc
am: d682839f62

* commit 'd682839f62257521c123bfa02ba0163eeaf02f73':

Change-Id: I0ef0f6ba8d094e092c18fadfb490942478a4cd37
2016-05-07 05:32:58 +00:00
Robin Lee
717898646d Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
am: 0d16f639bc

* commit '0d16f639bc530980835ed242a36f2dba526c0b7b':

Change-Id: Idec602687cea9c047b4c39ae7ddfbb74ace13e60
2016-05-07 05:32:57 +00:00
Bill Yi
6e936b232a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df -s ours
am: 35fb0fb796  -s ours

* commit '35fb0fb796a3a055002962ee0e1dced5b1e2f856':

Change-Id: If95b92b560dcd97280a1dcd009df87c8786316df
2016-05-07 05:32:56 +00:00
Clara Bayarri
1931308353 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe
am: da66986223

* commit 'da6698622346ff9171d464422ba2662571551c22':

Change-Id: If2e2ea61506a725d11c529b231fae9018e80ab96
2016-05-07 05:32:54 +00:00
Felipe Leme
c36f19e26f Merge "Implemented onRestrictPowerChanged()." into nyc-dev
am: f135ad5186

* commit 'f135ad5186377bb2525b644c09db92b1d9171656':
  Implemented onRestrictPowerChanged().

Change-Id: I936f603cd3feade0c821d0d17814b11317106a31
2016-05-07 05:30:12 +00:00
Jason Monk
d682839f62 Merge "Fix accessibility description on master clear" into nyc-dev
am: c12521cdcc

* commit 'c12521cdccb14f9f1bd623902d010090ebffc5d4':
  Fix accessibility description on master clear

Change-Id: I81313191558700095f6812392cc29c3b655a464a
2016-05-07 05:30:11 +00:00
Victor Chang
0d16f639bc Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am: 963c3a4e9f

* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
  TrustCredentials listview should be expanded by default

Change-Id: I4edd0c7687a8951456152f334a3a169c817f8ec1
2016-05-07 05:30:11 +00:00
Bill Yi
35fb0fb796 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7f1b86e5df  -s ours

* commit '7f1b86e5df66271371cd2e570b5a32c12cde7fee':
  Import translations. DO NOT MERGE

Change-Id: I3ce02f9f42210188d909e48fce22a21ab53ee816
2016-05-07 05:30:11 +00:00
Clara Bayarri
da66986223 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev
am: 2540d66bfe

* commit '2540d66bfed468615d560e93eaaa3621296db0ec':
  Remove invisible object in A11y Settings screens' menu

Change-Id: Idcdc2f7d4d1afb6c2c8b5e54a8a5cb5c6a4b3240
2016-05-07 05:30:08 +00:00
pkanwar
86f77ab1e2 resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
am: 3d4a586b80

* commit '3d4a586b80f6862f3f2452e07afad13f7b380133':

Change-Id: I36f8df9761b48a87bd3c3a255fc5182d141c6172
2016-05-07 05:30:06 +00:00
Pavlin Radoslavov
3d4a586b80 resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
Change-Id: I1eea61da6904c5d2c181962ff5bac75454d2929d
2016-05-06 18:57:18 -07:00
Felipe Leme
e53389309a Implemented onRestrictPowerChanged().
am: cf7d2727c7

* commit 'cf7d2727c7d3e646d1e3b082e44e18e64a17619b':
  Implemented onRestrictPowerChanged().

Change-Id: Ia381be8e0d848e86063e603f9a0b3f9080583adf
2016-05-07 01:19:46 +00:00
Felipe Leme
cf7d2727c7 Implemented onRestrictPowerChanged().
BUG: 28521946

Change-Id: I702e27401f74eee6ce884351ae4e0bc89ec6b8e2
(cherry picked from commit f79c20500e)
2016-05-07 01:12:26 +00:00
Felipe Leme
eb4350c377 Merge "Implemented onRestrictPowerChanged()." into nyc-dev am: f135ad5186
am: 51ccb04e01

* commit '51ccb04e019bbe375d601e70c86c226d091d10f3':
  Implemented onRestrictPowerChanged().

Change-Id: Ibe21a7331e306acc0ad7612ff3c3b86b2bd90727
2016-05-06 23:40:45 +00:00
Felipe Leme
51ccb04e01 Merge "Implemented onRestrictPowerChanged()." into nyc-dev
am: f135ad5186

* commit 'f135ad5186377bb2525b644c09db92b1d9171656':
  Implemented onRestrictPowerChanged().

Change-Id: I41d98a0483686c05b0b5e88ceb4b589c889a5e22
2016-05-06 23:33:31 +00:00
TreeHugger Robot
f135ad5186 Merge "Implemented onRestrictPowerChanged()." into nyc-dev 2016-05-06 23:25:28 +00:00
Sudheer Shanka
0451dc2e60 Update the visibility state of views in UserPreference properly.
Bug: 28629095
Change-Id: Id98affb36f19c4e78c5c9c6092638760efca76c0
2016-05-06 13:23:45 -07:00
Jason Monk
195a75ac95 Merge "Fix accessibility description on master clear" into nyc-dev am: c12521cdcc
am: 51112c1fce

* commit '51112c1fce3862c66444e92eff3c6865ff4c5931':
  Fix accessibility description on master clear

Change-Id: I1d64d2fb5129ba610b7b3ac13e6127d3eda42c1d
2016-05-06 19:08:48 +00:00
Jason Monk
51112c1fce Merge "Fix accessibility description on master clear" into nyc-dev
am: c12521cdcc

* commit 'c12521cdccb14f9f1bd623902d010090ebffc5d4':
  Fix accessibility description on master clear

Change-Id: Ic10e681974fe29769e886777fccd4974e730ad72
2016-05-06 19:03:31 +00:00
Jason Monk
c12521cdcc Merge "Fix accessibility description on master clear" into nyc-dev 2016-05-06 18:33:08 +00:00
Jason Monk
fda774104a Fix accessibility description on master clear
Only include visible views

Change-Id: I271ae87c788e270b15e7ca8758059771cde16d33
Fixes: 28316423
2016-05-06 14:28:09 -04:00
Jason Monk
2386dfc18d Dashboard performance work
Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.

Fixes: 28613950
Bug: 28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
2016-05-06 13:17:47 -04:00
Fan Zhang
789b3c9b51 Merge "Update support email/chat display string." into nyc-mr1-dev
am: 6d2dd23f85

* commit '6d2dd23f85006dfd32ac3e47f3a6ef8235469d17':
  Update support email/chat display string.

Change-Id: Iac53a8886e5c2f8eaa7d7a00078878e240877c9a
2016-05-06 15:57:35 +00:00
Fan Zhang
6d2dd23f85 Merge "Update support email/chat display string." into nyc-mr1-dev 2016-05-06 15:45:31 +00:00
Robin Lee
084b1fc864 Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
am: d48f9cf78e

* commit 'd48f9cf78e21924306855da02c71f9b65407b117':
  TrustCredentials listview should be expanded by default

Change-Id: I8f746b6b53ee17362f998bde5452ff4b447de2c3
2016-05-06 15:38:39 +00:00
Victor Chang
d48f9cf78e Merge "TrustCredentials listview should be expanded by default" into nyc-dev
am: 963c3a4e9f

* commit '963c3a4e9f06808c098fe3de4aaec5033431f21d':
  TrustCredentials listview should be expanded by default

Change-Id: I5ac13d383e7565acade2272c805e20b67fdc856a
2016-05-06 15:33:52 +00:00
Robin Lee
963c3a4e9f Merge "TrustCredentials listview should be expanded by default" into nyc-dev 2016-05-06 15:27:42 +00:00
Bill Yi
64b3799ff8 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df -s ours
am: 19f57505a0  -s ours

* commit '19f57505a0a894386f8cd39ead0545e1afcd45dc':
  Import translations. DO NOT MERGE

Change-Id: I7858ba5ad58e8954035dfdbf8b197fadf1771ae8
2016-05-06 14:32:55 +00:00
Bill Yi
d33940e148 Import translations. DO NOT MERGE
am: fb917b0b5d  -s ours

* commit 'fb917b0b5d65971420868d139260f5b5d04a45f3':
  Import translations. DO NOT MERGE

Change-Id: Icadb4a0a7fd2bfb740ab085ea13b5f38591d81d4
2016-05-06 14:28:10 +00:00
Bill Yi
19f57505a0 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7f1b86e5df  -s ours

* commit '7f1b86e5df66271371cd2e570b5a32c12cde7fee':
  Import translations. DO NOT MERGE

Change-Id: I74aa9a2ba14f127ab8ba758d2a65f24f4076e2a9
2016-05-06 14:26:57 +00:00
TreeHugger Robot
7f1b86e5df Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-06 14:14:48 +00:00
Clara Bayarri
6d11ab8a93 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe
am: 70c5569a18

* commit '70c5569a1877d2889e16a9d32133e5293bfacf83':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I4addaccd6a0182ff0f2e7303272f0a112cba37e0
2016-05-06 13:45:06 +00:00
Clara Bayarri
70c5569a18 Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev
am: 2540d66bfe

* commit '2540d66bfed468615d560e93eaaa3621296db0ec':
  Remove invisible object in A11y Settings screens' menu

Change-Id: I946cec97b7d891f29b8b026d5889511b227512d3
2016-05-06 13:40:18 +00:00
Clara Bayarri
2540d66bfe Merge "Remove invisible object in A11y Settings screens' menu" into nyc-dev 2016-05-06 13:36:11 +00:00
Victor Chang
9583dcecce TrustCredentials listview should be expanded by default
UI Change for 2-profile case:
1. When both personal and work listview are expanded, half height is allocated for each list view
2. When only one listview is expanded, full height is allocated to the list view

Video can be found at go/trust-cred-split-view

- Use 2 ListView instead of 1 ExpandableListView in order to scoll the list independently
- The ui is not changed for only one or more than 3 profiles.
- Remove TrustedCertificateAdapterCommons, and wrap GroupAdapter by ChildAdapter in order to re-use more codes
- clear mAliasLoaders in onDestroy. (Seems it's a bug.)
- When work mode or fbe locked, force to collapse work list view. User message will be prompted when user press on header
- Groups in GroupAdapter is set synchronously instead of async, since we assume the number of users are fixed during initialization
- DataSet events will go through GroupAdapter to notifiy ChildAdapter

Bug:28236955
(cherry picked from commit 7dde845544)

Change-Id: I87293afc56e9cc270c2289111bab6f1809351faf
2016-05-06 12:55:18 +00:00