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

28439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
e16aed4db5 Merge "Null check." into nyc-dev am: fc1bb74186 
am: d6575bcee2

* commit 'd6575bcee288f1b6b9a825c793bbbfd3d00e27b7':
  Null check.

Change-Id: Ifc8c584ec72f5fc19e45115d35cce7b3ef43a337
 2016-05-18 14:12:42 +00:00
Julia Reynolds
d6575bcee2 Merge "Null check." into nyc-dev 
am: fc1bb74186

* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
  Null check.

Change-Id: I1a170686d9df0c0094d154b2570f08f6145fe831
 2016-05-18 14:10:13 +00:00
Julia Reynolds
1ca6867e35 Merge "Null check." into nyc-dev 
am: fc1bb74186

* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
  Null check.

Change-Id: Idbcee7bd10b0f530c7d48760e93cd3f8be3448b5
 2016-05-18 14:10:12 +00:00
Julia Reynolds
fc1bb74186 Merge "Null check." into nyc-dev 2016-05-18 14:02:05 +00:00
Yohei Yukawa
8dbd68cbb7 Follow class package change: LocaleList am: 1ef9c4afd5 am: 161def60eb 
am: 4211355575

* commit '4211355575bb1d5f3eef3db81a4093258b0bf1f5':

Change-Id: I1f4b6818c2e644224ea7f28d9b8c07eccc830466
 2016-05-18 02:51:23 +00:00
Yohei Yukawa
4211355575 Follow class package change: LocaleList am: 1ef9c4afd5 
am: 161def60eb

* commit '161def60eb1e4a0b9b556ec828f55b0a9fc537b0':

Change-Id: I4d91a07c2190d6508f4c7fe8f1c82b4d51e57cfc
 2016-05-18 02:48:10 +00:00
Yohei Yukawa
937d41faaf Follow class package change: LocaleList am: 1ef9c4afd5 am: eb84d19de2 
am: 340ab5f69b

* commit '340ab5f69b91221639228ea9581d9b41ccb533d5':
  Follow class package change: LocaleList

Change-Id: I552e997e087cc1f8d7bb7e27f12169709754a027
 2016-05-18 02:29:55 +00:00
Yohei Yukawa
340ab5f69b Follow class package change: LocaleList am: 1ef9c4afd5 
am: eb84d19de2

* commit 'eb84d19de23d9b35a417f77af542eac5275721e5':
  Follow class package change: LocaleList

Change-Id: Ibf1754fe904b88bcdda6e0af891ba87b91ff84fe
 2016-05-18 02:27:12 +00:00
Yohei Yukawa
eb84d19de2 Follow class package change: LocaleList 
am: 1ef9c4afd5

* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
  Follow class package change: LocaleList

Change-Id: I725ad37be16a6175541a845cf537617f87dab7a1
 2016-05-18 02:24:58 +00:00
Yohei Yukawa
161def60eb Follow class package change: LocaleList 
am: 1ef9c4afd5

* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
  Follow class package change: LocaleList

Change-Id: I5c36047c90d110aa241b86ea74b23648526833e8
 2016-05-18 02:24:57 +00:00
Yohei Yukawa
1ef9c4afd5 Follow class package change: LocaleList 
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1].  This CL follows up that
package change.

No behavior change is intended.

 [1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18

Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
 2016-05-17 16:25:39 -07:00
pkanwar
b3f01860b3 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b am: 23e8435899 
am: f23a64afb8

* commit 'f23a64afb87a6fb1580951970ca322192001e54e':

Change-Id: I9dc9326b1d231fb42d6277c6dbd2ae8f9eedf272
 2016-05-17 22:40:47 +00:00
pkanwar
553eef0d12 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b am: edb9f49afe 
am: 2a0f73ab89

* commit '2a0f73ab89ae4587ce66b2daa983dcb0d83bf060':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I6908ae584f85cf48cbe1d4055dcf3b858c8460b1
 2016-05-17 22:40:45 +00:00
Pankaj Kanwar
f23a64afb8 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b 
am: 23e8435899

* commit '23e8435899fb06e6eb8c853e734d189ca2969b16':

Change-Id: Iebd464a3d91a1d8f79de2df0d437aee687922e20
 2016-05-17 22:36:38 +00:00
Pankaj Kanwar
2a0f73ab89 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b 
am: edb9f49afe

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

Change-Id: I78d24c405566eaa5da282bbb2042d0c6f0d3cf40
 2016-05-17 22:36:03 +00:00
pkanwar
edb9f49afe 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: I92577a0d913f0b8436df28708dc6d84c5c82c01a
 2016-05-17 22:31:17 +00:00
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