Sudheer Shanka
5581312428
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I55d25ec0d3fc06ba099aec098220500ed7c8d61f
2016-05-16 20:22:30 +00:00
Julia Reynolds
1f9ae181b0
Merge "Fix crash on rotation." into nyc-dev am: 075690875b
...
am: edd4824d44
* commit 'edd4824d44ada4095d8715e26fba08479a6d7219':
Fix crash on rotation.
Change-Id: I108cd3d51018987f37b6249e53684eb81b4de832
2016-05-16 20:22:30 +00:00
Julia Reynolds
edd4824d44
Merge "Fix crash on rotation." into nyc-dev
...
am: 075690875b
* commit '075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I6bb07ec33e7fa029047d416d758cfa8e6985d3af
2016-05-16 20:19:50 +00:00
Julia Reynolds
3d18e1991a
Merge "Fix crash on rotation." into nyc-dev
...
am: 075690875b
* commit '075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I08a281fa426b81ebcf0021b89adbe04379d305ec
2016-05-16 20:19:46 +00:00
TreeHugger Robot
31fb2a7a1d
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
2016-05-16 20:19:07 +00:00
Julia Reynolds
075690875b
Merge "Fix crash on rotation." into nyc-dev
2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b
Fix crash on rotation.
...
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
2016-05-16 15:56:15 -04:00
Jiaquan He
8b9b00f964
Merge "Add an option allowing to skip wallpaper apps selection."
2016-05-16 19:21:46 +00:00
Sudheer Shanka
dc3ed0a5bf
Fix crash in SetupRedactionInterstitial.
...
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Julia Reynolds
c0eed9a1eb
Merge "Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
am: 35dc1899a6" into nyc-mr1-dev-plus-aosp
...
am: b7656a26dc
* commit 'b7656a26dc5528b62d6413ba3b6b7ab64266e281':
Change-Id: I4818b21b66b91352c8104938546e9fb6f39636a6
2016-05-16 18:40:44 +00:00
Julia Reynolds
314d265f3d
Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
am: 84082aac24
...
am: c34538754a
* commit 'c34538754a9d18506f7c2d71e2db7c6a26fa2473':
Catch rule creation exceptions.
Change-Id: If2fecb8e96d4c468050fd560135b1d1034717102
2016-05-16 18:39:22 +00:00
Android Build Merger (Role)
b7656a26dc
Merge "Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
am: 35dc1899a6" into nyc-mr1-dev-plus-aosp
2016-05-16 18:36:55 +00:00
Julia Reynolds
0b1cd5e14c
Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
...
am: 35dc1899a6
* commit '35dc1899a6ecd55534135d63a58d19160d86af2a':
Catch rule creation exceptions.
Change-Id: I7490151940e0476a400cb79adf40054ab35df0ea
2016-05-16 18:35:56 +00:00
Julia Reynolds
c34538754a
Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
...
am: 84082aac24
* commit '84082aac240febc46d6db1b94530b047e522b200':
Catch rule creation exceptions.
Change-Id: I99aeb96b8e8b9494a4e388f53e52bdb90288970d
2016-05-16 18:34:17 +00:00
Julia Reynolds
84082aac24
Merge "Catch rule creation exceptions." into nyc-dev
...
am: f1c2e62f4e
* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173
2016-05-16 18:29:21 +00:00
Julia Reynolds
35dc1899a6
Merge "Catch rule creation exceptions." into nyc-dev
...
am: f1c2e62f4e
* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: Ia0aa67e7aa968b18dc54a4a171780fb283b3bee8
2016-05-16 18:29:16 +00:00
Julia Reynolds
f1c2e62f4e
Merge "Catch rule creation exceptions." into nyc-dev
2016-05-16 18:22:15 +00:00
Jiaquan He
fe4e80b98b
Add an option allowing to skip wallpaper apps selection.
...
This commit adds an option to the Settings application, making it
possible to skip the wallpaper apps selecting and directly lead to
the wallpaper picker.
Bug: 28554244
Change-Id: Id93b69c397e7eec6fdf9fd2c5812fd359cae58c2
2016-05-16 18:08:34 +00:00
Clara Bayarri
4828bf3b7f
Rename requestKeyboardShortcutsHelper am: fcc411c807
am: 0220d40488
...
am: d3e48cd84d
* commit 'd3e48cd84d47dd12a0fea29739eb8a0274413865':
Change-Id: I9658b5c2428a82bcf9409e773774feb227e2744a
2016-05-16 15:20:58 +00:00
Clara Bayarri
c58114ccdd
Rename requestKeyboardShortcutsHelper am: fcc411c807
am: 41db2612ff
...
am: 709ba02218
* commit '709ba022180774af5c43e28ac7ec4b3a9f7898e2':
Rename requestKeyboardShortcutsHelper
Change-Id: Ie48a6ed4a97926bc31bf3b0c55d6ea3471bb0e73
2016-05-16 15:20:57 +00:00
Clara Bayarri
d3e48cd84d
Rename requestKeyboardShortcutsHelper am: fcc411c807
...
am: 0220d40488
* commit '0220d40488b625e45476e035d53770b18a18618d':
Change-Id: I0d9ca1ea03fd447e37bce70f9660f398df57ba15
2016-05-16 15:18:00 +00:00
Clara Bayarri
709ba02218
Rename requestKeyboardShortcutsHelper am: fcc411c807
...
am: 41db2612ff
* commit '41db2612ff1dc8a2cd3e54142a269e211f2529cc':
Rename requestKeyboardShortcutsHelper
Change-Id: I90b0e5f7be3825d462b964d14eb0183273d119ef
2016-05-16 15:14:44 +00:00
Clara Bayarri
41db2612ff
Rename requestKeyboardShortcutsHelper
...
am: fcc411c807
* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I807f9d504e2a93b2090f22261c9ff911eb3349cc
2016-05-16 15:09:33 +00:00
Clara Bayarri
0220d40488
Rename requestKeyboardShortcutsHelper
...
am: fcc411c807
* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I5333409492e2a64d4015c601714e1d0ec041e54f
2016-05-16 15:09:31 +00:00
Julia Reynolds
992422fd5e
Catch rule creation exceptions.
...
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807
Rename requestKeyboardShortcutsHelper
...
Per API Council feedback
Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
2016-05-16 14:16:46 +01:00
Steven Ng
55077a4851
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: 030060a321
...
am: 958d1253c5
* commit '958d1253c52bd5556bc5d60153b1002206489c9a':
Add a Global setting for disabling OEM unlocking setting
Change-Id: I137570ed577c74f023dee6fb059afd34495a4727
2016-05-16 09:28:36 +00:00
Steven Ng
958d1253c5
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
...
am: 030060a321
* commit '030060a32166990585cf0ef2c007e7f787e5dd7d':
Add a Global setting for disabling OEM unlocking setting
Change-Id: I8fa26a26e174e0e44875eb925aad9f3978373e04
2016-05-16 09:25:39 +00:00
Steven Ng
030060a321
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
2016-05-16 09:20:43 +00:00
Daniel Nishi
2f1da3901d
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev am: 03f26d3997
...
am: e592a41727
* commit 'e592a41727fc498d3a18a08720dc55b98723c87d':
Add an Activity to handle Intents to invoke the Deletion Helper.
Change-Id: Ifc706565a021577c05b924b0f8c2ea4f467fb928
2016-05-14 01:26:10 +00:00
Daniel Nishi
e592a41727
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
...
am: 03f26d3997
* commit '03f26d39972d4d063096ccbc00ebec53365ce455':
Add an Activity to handle Intents to invoke the Deletion Helper.
Change-Id: I7322ce796fe4910d9904e37d0bf142bbc90b5f47
2016-05-14 01:23:28 +00:00
Daniel Nishi
03f26d3997
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
2016-05-14 01:14:15 +00:00
Daniel Nishi
07e9f774b0
Merge "Add downloads to the deletion helper." into nyc-mr1-dev am: 95c3c5045f
...
am: de98b25c01
* commit 'de98b25c01341663847252fceaf97d64ceafbb29':
Add downloads to the deletion helper.
Change-Id: I092289edbde4d9b439cb6a55ce2a507f5a36a444
2016-05-14 00:15:06 +00:00
Daniel Nishi
de98b25c01
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
...
am: 95c3c5045f
* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
Add downloads to the deletion helper.
Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Daniel Nishi
95c3c5045f
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
2016-05-14 00:05:01 +00:00
Daniel Nishi
287d91181f
Add an Activity to handle Intents to invoke the Deletion Helper.
...
This will allow apps to launch the deletion helper when they need to
have space freed up.
To launch the activity using an intent, you can set it as follows:
Intent intent = new Intent(Settings.ACTION_DELETION_HELPER_SETTINGS);
startActivity(intent);
This intent should bring up the Deletion Helper.
Bug: 28675265
Change-Id: I781615ccad4ca1fcae97817ecb823e5dcad67b5b
2016-05-13 17:03:30 -07:00
Felipe Leme
9c7bb2775a
Display total storage for Internal shared storage.
...
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG: 24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
2016-05-13 15:40:34 -07:00
Sudheer Shanka
763bc9c286
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
am: b071fdca57
...
am: 91140fde74
* commit '91140fde7408d064432416a6f19b3e7151538d9c':
Change-Id: Idbb3b646e53fd4fa53b0b542937569a44dc55bae
2016-05-13 21:46:00 +00:00
Sudheer Shanka
cbc30980d8
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
am: 3ad3bd66ad
...
am: 50f9e16450
* commit '50f9e164506b25552011ef10135b2e6a8960672f':
Guard against exception when getting package installer info.
Change-Id: Icd833758c22ec8045c1a53b01b26fc14a43bc311
2016-05-13 21:45:58 +00:00
Sudheer Shanka
91140fde74
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
...
am: b071fdca57
* commit 'b071fdca574bee356e2c37eb9a093f1b73731df6':
Change-Id: I8b0cbe39b30eead53b93811329de3e01e3866858
2016-05-13 21:37:07 +00:00
Sudheer Shanka
50f9e16450
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
...
am: 3ad3bd66ad
* commit '3ad3bd66adb2be016654c8655f8bad4ddc0bcd79':
Guard against exception when getting package installer info.
Change-Id: I2de57942f4e844375e6dfe6f4f0a9489f9d6382b
2016-05-13 21:34:24 +00:00
Sudheer Shanka
b071fdca57
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: I3cf5a62c44b12356b48f841a03874f93b1c23981
2016-05-13 21:29:02 +00:00
Sudheer Shanka
3ad3bd66ad
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: Ibe6459ec92ffe90872c3380d865baea6cb257508
2016-05-13 21:29:01 +00:00
TreeHugger Robot
15c1bb48c3
Merge "Guard against exception when getting package installer info." into nyc-dev
2016-05-13 21:18:06 +00:00
Daniel Nishi
2ef20fb36d
Add downloads to the deletion helper.
...
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.
Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Sudheer Shanka
aed0537aaf
Guard against exception when getting package installer info.
...
Bug: 28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
2016-05-13 12:58:42 -07:00
Makoto Onuki
10e793f71e
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
...
am: 01438a9213
* commit '01438a921309f8658b434846173e6fd9404161eb':
Change-Id: I500e4dfc3792e450c5e35acbb73e272f6f2d3ff6
2016-05-13 19:02:37 +00:00
Makoto Onuki
bf30f5ff4d
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
...
am: b4e61334ff
* commit 'b4e61334ffcd84e0f82cd37961ca8339c7c8c5f0':
Change-Id: I9002219976bcce0aaae3bedb3d9e8ead36b93621
2016-05-13 19:02:36 +00:00
Makoto Onuki
7f8be3672c
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: f4ffd6daff
...
am: dc3bb2798a
* commit 'dc3bb2798ad962b6ca4e4508ff2189d747c75825':
ShortcutManager: Remove developer option from NYC
Change-Id: Ia21a7274381dd28c16934d23570962867a08680b
2016-05-13 19:02:35 +00:00
Android Build Merger (Role)
01438a9213
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
2016-05-13 19:00:27 +00:00