PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,435 Commits 1 Branch 0 Tags
a638e869f1ec02f4f49e263cefdae99d30e53a86
Commit Graph

27435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
a638e869f1 Merge "Merge "Null check." into nyc-dev am: fc1bb74186 am: 1ca6867e35" into nyc-mr1-dev-plus-aosp 2016-05-18 14:12:58 +00:00
Julia Reynolds
5e8831c6b1 Merge "Null check." into nyc-dev am: fc1bb74186 
am: 1ca6867e35

* commit '1ca6867e3541d30fc1dd8a51a856e49dda675bdb':
  Null check.

Change-Id: Ib62b96a074606166dafd1c1cf3d6905df491a67c
 2016-05-18 14:12:44 +00:00
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
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
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
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
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
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
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
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
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
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
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
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