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

28573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pkanwar
23e8435899 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev 
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
 2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev 2016-05-17 22:16:49 +00:00
Julia Reynolds
47beeec10b Null check. 
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
 2016-05-17 16:14:10 -04:00
Felipe Leme
98b4ba1a8d Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330 am: df9714e9de 
am: 4331b410be

* commit '4331b410be0c5a941814e1c33c48f88e8465f719':

Change-Id: Iae1cdb45db89f036da9f7f3a5d8a9b1feae6102f
 2016-05-17 19:08:09 +00:00
pkanwar
956597eaf8 Choose Bluetooth Device window cant't fill screen 
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.

Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
 2016-05-17 12:03:42 -07:00
Felipe Leme
2d88dd7c42 Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330 am: 26e2c6bc26 
am: fd122829ec

* commit 'fd122829ec0544d25f33c4842fc014fddcad9836':
  Implemented onRestrictBackgroundBlacklistChanged().

Change-Id: Idabaf686ef95056feb22396943046e13de9d7651
 2016-05-17 18:50:42 +00:00
Daniel Nishi
d0f1b67ed3 Merge "Add the automatic storage manager settings." into nyc-mr1-dev am: 699efba106 
am: 2582b5f108

* commit '2582b5f108759362bd05e04b5f368c58f43194fc':
  Add the automatic storage manager settings.

Change-Id: Ib24111573bd46be4fe8e327c4dd38170d04adc37
 2016-05-17 18:50:41 +00:00
Felipe Leme
4331b410be Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330 
am: df9714e9de

* commit 'df9714e9de5506100669480ae19e723a9957a3ef':

Change-Id: I9aecb8efe4b187614fac26cec9341eaed1637489
 2016-05-17 18:50:28 +00:00
Felipe Leme
df9714e9de Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev 
am: c769ddd330

* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
  Implemented onRestrictBackgroundBlacklistChanged().

Change-Id: Ia3bd9fa234c8ccff136e9999b87abf642ecc9d17
 2016-05-17 18:43:58 +00:00
Felipe Leme
fd122829ec Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330 
am: 26e2c6bc26

* commit '26e2c6bc260e33b14ab25a82a9622d97c4d46447':
  Implemented onRestrictBackgroundBlacklistChanged().

Change-Id: Iac0d0baa11ba15176884fad16321242ebd822382
 2016-05-17 18:41:52 +00:00
Daniel Nishi
2582b5f108 Merge "Add the automatic storage manager settings." into nyc-mr1-dev 
am: 699efba106

* commit '699efba10667eb18bd28de02aebb549257baf53e':
  Add the automatic storage manager settings.

Change-Id: I7518c8784a43ee522ebc3ff06097c474b24d2725
 2016-05-17 18:41:51 +00:00
Felipe Leme
26e2c6bc26 Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev 
am: c769ddd330

* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
  Implemented onRestrictBackgroundBlacklistChanged().

Change-Id: Ifb0c4bdfa825948cb18d382c0c8eb29ce3d187b7
 2016-05-17 18:39:08 +00:00
TreeHugger Robot
c769ddd330 Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev 2016-05-17 18:28:21 +00:00
Daniel Nishi
699efba106 Merge "Add the automatic storage manager settings." into nyc-mr1-dev 2016-05-17 18:10:53 +00:00
Rachel Zhang
55cd13f44a Merge "Remove settings overflow menu" into nyc-mr1-dev am: 97a8db3c8a 
am: f5239e1e7c

* commit 'f5239e1e7c2e665b821400c5e0ce5daa9e82c592':
  Remove settings overflow menu

Change-Id: Ib58b8d2942cf2db0540faaf33315c72d3c4a8c00
 2016-05-17 16:59:03 +00:00
Rachel Zhang
f5239e1e7c Merge "Remove settings overflow menu" into nyc-mr1-dev 
am: 97a8db3c8a

* commit '97a8db3c8af60ffa381347963a0ccaf700a71ee7':
  Remove settings overflow menu

Change-Id: I081b2dab824053294749995deb41147c8620a57a
 2016-05-17 16:56:20 +00:00
Rachel Zhang
97a8db3c8a Merge "Remove settings overflow menu" into nyc-mr1-dev 2016-05-17 16:51:25 +00:00
Daniel Nishi
116a55cdab Add the automatic storage manager settings. 
This provides a toggle for changing if the storage manager
is turned on or off and how many days of data to retain.

It is currently not hooked up to anything currently and only acts as
the view, pending b/28600825.

Bug: 28560570
Change-Id: Iaa2d819f26addab4dc02ced80e9ba79e0fcf0980
 2016-05-17 09:32:12 -07:00
Daniel Nishi
d8c0d970d6 Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev am: e86eae854c 
am: 8ab8e4c6c4

* commit '8ab8e4c6c42a24fe60799a27edbbd4e04a9ce4e2':
  Add an alert dialog before clearing data in deletion helper.

Change-Id: I2c47aeb1e604cb4628d2e7f711ba22bd1e2215d7
 2016-05-17 16:28:45 +00:00
Daniel Nishi
8ab8e4c6c4 Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev 
am: e86eae854c

* commit 'e86eae854cb8c31d67497578dc5ba78ae50e8d8e':
  Add an alert dialog before clearing data in deletion helper.

Change-Id: Ide9c26bcfa719b812eecec43ef63ca6f7a8f0a54
 2016-05-17 16:26:12 +00:00
Daniel Nishi
e86eae854c Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev 2016-05-17 16:21:27 +00:00
Shweta Chahar
877b7a6f26 Merge "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: d16f4fd531" into nyc-mr1-dev-plus-aosp 
am: cee0578ea3

* commit 'cee0578ea3e871a83f5a47593c6591bf76591095':

Change-Id: I41e3bbd5fe995df131408fcd885728e1a411ad3b
 2016-05-17 14:37:40 +00:00
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
Android Build Merger (Role)
cee0578ea3 Merge "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: d16f4fd531" into nyc-mr1-dev-plus-aosp 2016-05-17 14:35:09 +00:00
Shweta Chahar
d30bb56e95 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: d16f4fd531

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

Change-Id: Iba0ddea4eb81dfb6fe27baa4ff9c06b0a0a91080
 2016-05-17 14:35:02 +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
d16f4fd531 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: Id9f34074524813aedcf2994fd1a424b5e2b0185c
 2016-05-17 14:32:45 +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
yifan.bai
4bf1704650 Fix register multiple PhoneStateListeners. 
To avoid multiple PhoneStateListeners are registered, when user changes
the tab between SIMs, unregister the previous listener.

Change-Id: I99cf36a2c25bfbb74322b55efc6d751ea96810e5
 2016-05-17 09:47:43 +00:00
Baligh Uddin
61e61931e6 Import translations. DO NOT MERGE 
Change-Id: I6b058c724477ba0095e43fe4d78460ffff4893e5
Auto-generated-cl: translation import
 2016-05-16 23:51:59 -07:00
Baligh Uddin
e5e29d5073 Import translations. DO NOT MERGE 
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
 2016-05-16 23:39:18 -07:00
Baligh Uddin
e896cb7519 Import translations. DO NOT MERGE 
Change-Id: I445f622f50145fa550439715192e744fd2cc79e9
Auto-generated-cl: translation import
 2016-05-16 22:36:38 -07: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
Daniel Nishi
46c32b9e32 Add an alert dialog before clearing data in deletion helper. 
The dialog states how much space will be freed by the deletion
and prompts the user to either cancel or continue with the
deletion.

BUG: 28762412
Change-Id: I8db2a8f928c82ebaa2cf5fea030b6b6f4730eb3e
 2016-05-16 15:36:28 -07:00
Rachel Zhang
471815e4bd Remove settings overflow menu 
Bug: 28139684
Change-Id: I099af85878fde5f2317be312f979994fbbc87287
 2016-05-16 13:43:51 -07:00
Felipe Leme
b2c4949de7 Implemented onRestrictBackgroundBlacklistChanged(). 
BUG: 28743623

Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
 2016-05-16 20:43:12 +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