Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,001 Commits 1 Branch 0 Tags
69d6fd5f0fb90b884cd58282a81b06d1f026d2f2
Commit Graph

12192 Commits

Author SHA1 Message Date
Daniel Nishi
769774a4dd resolve merge conflicts of b59dbf6 to master 
Change-Id: I6ef5cd4bae9ff67a5b5367b291a14731e5b871eb
 2016-05-10 11:17:28 -07:00
Daniel Nishi
b59dbf632f Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev 
am: 7961077e3a

* commit '7961077e3acdbb7dc0648b5ce7314adb504de0bf':
  Create an overlay to add a photo and video deletion helper service.

Change-Id: Ied44ae1ae3c26ebf010a95afe8897e04e25b28e3
 2016-05-10 17:57:50 +00:00
Daniel Nishi
7961077e3a Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev 2016-05-10 17:50:21 +00:00
Daniel Nishi
38889de699 Create an overlay to add a photo and video deletion helper service. 
This overlay defines a checkbox preference in the deletion helper for
facilitating the deletion of photos and videos. The service which
provides deletion clearing can be overridden and used to create a
custom photo and video deletion helper.

Bug: 28554187
Bug: 28560856

Change-Id: Id5d9671a307aaac0d1331f055b8f2ab7aa67977c
 2016-05-10 10:48:59 -07:00
Jason Monk
77a19385e3 Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b am: 75a09c1db9 
am: 08358a899a

* commit '08358a899abc4cd7b40ce81ba68e63d7797b9f23':
  Fix label loading on default home setting

Change-Id: I8ca957720f11b9fd099681daf118634a6d9c9838
 2016-05-10 17:44:10 +00:00
Jason Monk
08358a899a Merge "Fix label loading on default home setting" into nyc-dev am: cbf2ccbe1b 
am: 75a09c1db9

* commit '75a09c1db9e9a441d4678171b921431fc629ee94':
  Fix label loading on default home setting

Change-Id: I923fbaa7095ed4c5fcda4f8e9f56e508af7b976c
 2016-05-10 17:40:57 +00:00
Jason Monk
75a09c1db9 Merge "Fix label loading on default home setting" into nyc-dev 
am: cbf2ccbe1b

* commit 'cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
  Fix label loading on default home setting

Change-Id: Idaa6dcdf870bf19bcee6b9696b62dbafeeb3465a
 2016-05-10 17:38:24 +00:00
Jason Monk
cbf2ccbe1b Merge "Fix label loading on default home setting" into nyc-dev 2016-05-10 17:34:09 +00:00
Hyunyoung Song
ee6f8c6fe5 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev am: 6f2771623f 
am: 0e9f297027

* commit '0e9f29702754228bfa1041160d333a379075ef1a':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: If1505cf2e041fe7a41a245f8ce7895af7883da09
 2016-05-10 17:33:13 +00:00
Hyunyoung Song
0e9f297027 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev 
am: 6f2771623f

* commit '6f2771623f3a93d51ad075c476ca9b538c0d44e6':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: I04623fcec7e8046c7a5e905e09261d5c9e550018
 2016-05-10 17:30:20 +00:00
Hyunyoung Song
6f2771623f Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev 2016-05-10 17:21:48 +00:00
Hyunyoung Song
1e51aa507d Revert "Add shortcut manager support to Settings (2/2) b/28298258" 
b/28643184
This reverts commit 79ec6df771.

Change-Id: I3de8a27e88a5a84825e914725259530b22756da0
 2016-05-10 17:16:33 +00:00
Jason Monk
96be611e16 Fix label loading on default home setting 
Change-Id: Ia7d00eaf48eb703b766c760b6140ea98be5490f1
Fixes: 28668320
 2016-05-10 12:47:37 -04:00
Victor Chang
e622c66052 Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe am: 5ffcedbae9 
am: f906f3c24a

* commit 'f906f3c24a711e02ed17fa0ebf1aa7dc024fabdf':
  Show a different Root CA string for device owner

Change-Id: Ida47ae23f8ab6ec97a9535b2e4e2bbcf7673dd03
 2016-05-10 14:50:46 +00:00
Victor Chang
f906f3c24a Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe 
am: 5ffcedbae9

* commit '5ffcedbae97338a8d549592d8149cee98cea61f0':
  Show a different Root CA string for device owner

Change-Id: I2b939b8fbbff30b3fef67a334d06c5ee19e901ea
 2016-05-10 14:42:47 +00:00
Victor Chang
5296dbca73 Merge "Show a different Root CA string for device owner" into nyc-dev 
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
 2016-05-10 14:35:53 +00:00
Victor Chang
5ffcedbae9 Merge "Show a different Root CA string for device owner" into nyc-dev 
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I85745e298c2e141f55446c8f0460f4745b1b8767
 2016-05-10 14:35:53 +00:00
Victor Chang
9c31684bbe Merge "Show a different Root CA string for device owner" into nyc-dev 2016-05-10 14:29:39 +00:00
Felipe Leme
4ae532c728 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf am: 2af22b9324 
am: 542a348f75

* commit '542a348f75c239111ce64b01a8d7afc844f4c194':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: I512d7130837b5cd346ff4b7cdc13013496f84149
 2016-05-09 20:18:16 +00:00
Felipe Leme
542a348f75 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev am: 8c3b5fa3cf 
am: 2af22b9324

* commit '2af22b9324cefed224c65d2b91b2245246f50552':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: I5847f67777f723e7e9c06c0e120dfedb414f40c6
 2016-05-09 20:11:16 +00:00
Felipe Leme
2af22b9324 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 
am: 8c3b5fa3cf

* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: If2d8f9673af0150d8a2a10aa0d0f9de0c17f4161
 2016-05-09 20:05:42 +00:00
Felipe Leme
2318d40fc3 Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 
am: 8c3b5fa3cf

* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
  Added title for stand-alone App Data Usage activitiy.

Change-Id: Ifb78da77b270aab297ba67037a85a37cc26a769a
 2016-05-09 20:05:38 +00:00
Fan Zhang
34c1f09b05 Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 am: 8f834a10e0 
am: 0638e943d5

* commit '0638e943d5b7a31390e3cef835affa40895dcccb':
  Fix crash when rotating screen in a few screens.

Change-Id: Idff4d69f9618a193712e4a9f2d17646a3b461585
 2016-05-09 19:58:58 +00:00
Fan Zhang
0638e943d5 Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 
am: 8f834a10e0

* commit '8f834a10e083df651a3f003e248d58eaacae99ce':
  Fix crash when rotating screen in a few screens.

Change-Id: I62a625e0a51e6adda598aa911125a65484358155
 2016-05-09 19:53:38 +00:00
TreeHugger Robot
8c3b5fa3cf Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev 2016-05-09 19:50:11 +00:00
Fan Zhang
8f834a10e0 Merge "Fix crash when rotating screen in a few screens." into nyc-dev 
am: 2728874605

* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
  Fix crash when rotating screen in a few screens.

Change-Id: Ie31ea933c19597c73b5454fe944dca751435550e
 2016-05-09 19:48:22 +00:00
Fan Zhang
3bfe967e5c Merge "Fix crash when rotating screen in a few screens." into nyc-dev 
am: 2728874605

* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
  Fix crash when rotating screen in a few screens.

Change-Id: I5fa56a9910016e76d30a845fa4578f07eb2229e5
 2016-05-09 19:48:22 +00: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
Jason Monk
572b3c82fc Merge "Dashboard performance work" into nyc-dev am: 04b25af149 am: 96eedcfdd2 
am: fc5f0d4d20

* commit 'fc5f0d4d20817112d7d8d101f245ba50d45728e8':
  Dashboard performance work

Change-Id: I5daad812baf80d27ea6cf097bea15065fa581a7b
 2016-05-09 13:48:48 +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
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
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
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
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
cf7d2727c7 Implemented onRestrictPowerChanged(). 
BUG: 28521946

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

* commit 'eb4350c3773b483045cd79589fb8a5e53580619f':
  Implemented onRestrictPowerChanged().

Change-Id: I1400957b714c0d88b9acd9e7ed6dcb263df68fd0
 2016-05-06 23:46:08 +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
Jason Monk
2f67e253d5 Merge "Fix accessibility description on master clear" into nyc-dev am: c12521cdcc am: 51112c1fce 
am: 195a75ac95

* commit '195a75ac95c6d541669a8331c20b7d92af34d14d':
  Fix accessibility description on master clear

Change-Id: I33775f9eaedc9514d424d2ae61863b32f41228e0
 2016-05-06 19:13:05 +00: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