PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,290 Commits 1 Branch 0 Tags
66b46ff31f33bcdfd615130d12be8a84c880da2d
Commit Graph

28290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shwetachahar
66b46ff31f Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5 am: b34112820a 
am: b30db5ebd9

* commit 'b30db5ebd972bc467bc78faa647a038a64f6a583':
  Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.

Change-Id: Ic90bf5c75ff189b0f5c0a0b15d56ae6950846f53
 2016-05-17 14:37:39 +00:00
Shweta Chahar
b30db5ebd9 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5 
am: b34112820a

* commit 'b34112820a7dcee3a85a8e7163b194f614a9e840':
  Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.

Change-Id: Ie097c2500e58c7cf6472b3f8962c59f376f8b6bf
 2016-05-17 14:34:55 +00:00
shwetachahar
b34112820a Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev 
am: 1cb87b2af5

* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
  Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.

Change-Id: I72f2a0a95aadb87031ab53c9d2479f45f3e452ef
 2016-05-17 14:32:16 +00:00
Shweta Chahar
1cb87b2af5 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev 2016-05-17 14:27:09 +00:00
shwetachahar
43d93289ba Modify the TTS engine preference UI so that the radio button and the TTS 
engine name are a single focusable element.

Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
 2016-05-17 13:56:57 +01:00
Maurice Lam
a275fdd5ac Merge "Set fingerprint accent/primary color" into nyc-mr1-dev am: 8c64604d16 
am: ee5af0f825

* commit 'ee5af0f82532754df16a12e9d8f668eadce9562d':
  Set fingerprint accent/primary color

Change-Id: I0585f0307e85b8344e7a9a1d4ebba613913bc96d
 2016-05-16 23:42:31 +00:00
Maurice Lam
ee5af0f825 Merge "Set fingerprint accent/primary color" into nyc-mr1-dev 
am: 8c64604d16

* commit '8c64604d16500a43e607d0517605d5d62b4108c6':
  Set fingerprint accent/primary color

Change-Id: Iabc41c0cfaa160e575c19858a48ac27ad54fe8af
 2016-05-16 23:38:36 +00:00
Maurice Lam
8c64604d16 Merge "Set fingerprint accent/primary color" into nyc-mr1-dev 2016-05-16 23:25:29 +00:00
Sudheer Shanka
2e33aa32d9 Merge "Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d am: 5581312428" into nyc-mr1-dev-plus-aosp 
am: fe2d10fb24

* commit 'fe2d10fb2408bb9c0d0f730f6478c75287085241':

Change-Id: Ia8cd70a78726e14f2101f27fd72427933d38559d
 2016-05-16 20:27:39 +00:00
Julia Reynolds
301900e817 Merge "Merge "Fix crash on rotation." into nyc-dev am: 075690875b am: 3d18e1991a" into nyc-mr1-dev-plus-aosp 
am: bd22827512

* commit 'bd2282751263e7c73c4e319a0982d5f5830aca66':

Change-Id: I833313c8a9c65526c26d0cfed5c31d741cf4f6a2
 2016-05-16 20:27:38 +00:00
Sudheer Shanka
2753def6b2 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d am: 7cc2fa51d1 
am: f114a556fe

* commit 'f114a556fedb84a0f82925360431abaa7d034bc5':
  Fix crash in SetupRedactionInterstitial.

Change-Id: Ic0cb5a47169da68260a1384e21549d7843fa708a
 2016-05-16 20:27:37 +00:00
Android Build Merger (Role)
fe2d10fb24 Merge "Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d am: 5581312428" into nyc-mr1-dev-plus-aosp 2016-05-16 20:25:22 +00:00
Android Build Merger (Role)
bd22827512 Merge "Merge "Fix crash on rotation." into nyc-dev am: 075690875b am: 3d18e1991a" into nyc-mr1-dev-plus-aosp 2016-05-16 20:25:19 +00:00
Julia Reynolds
495bd2c5a8 Merge "Fix crash on rotation." into nyc-dev am: 075690875b am: edd4824d44 
am: 1f9ae181b0

* commit '1f9ae181b0165afea0e5f70d35d1b9ec1027b049':
  Fix crash on rotation.

Change-Id: I88b20356aef9ebf32ffc6cfc9aa6048ce93d0494
 2016-05-16 20:25:10 +00:00
Sudheer Shanka
c63fb662f0 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d 
am: 5581312428

* commit '5581312428580ceb4960db5a89e4079480d1349d':
  Fix crash in SetupRedactionInterstitial.

Change-Id: Ie361c236b73c658c6552959bb46f7becbdcd0f57
 2016-05-16 20:25:01 +00:00
Julia Reynolds
b05176b02e Merge "Fix crash on rotation." into nyc-dev am: 075690875b 
am: 3d18e1991a

* commit '3d18e1991a29b18f84d8859cebf8736d050f8c10':

Change-Id: Idc7092febf05500167c82566a77f01fe6fa2efda
 2016-05-16 20:25:00 +00:00
Sudheer Shanka
f114a556fe Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d 
am: 7cc2fa51d1

* commit '7cc2fa51d1dc40a85f88a86c748c039b81a6af46':
  Fix crash in SetupRedactionInterstitial.

Change-Id: I6b924c3a07fb51b29e39fb18c7af5e3038f472fd
 2016-05-16 20:24:58 +00:00
Sudheer Shanka
7cc2fa51d1 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev 
am: 31fb2a7a1d

* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
  Fix crash in SetupRedactionInterstitial.

Change-Id: I526e7fe3e9c11bb36babc386c1cbbcb0187e6bbd
 2016-05-16 20:22:31 +00:00
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