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

28369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
86dbfc792a Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: cdc59c8709" into nyc-mr1-dev-plus-aosp 
am: 5e01c6c2f6

* commit '5e01c6c2f6508b7a167ccc0f900b0938830488a5':

Change-Id: I99429f53fdae516733de5460ec8d192717c242fc
 2016-05-19 11:14:38 +00:00
Kenny Guy
6468225b40 Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: 01891c5bf0 
am: 8da57a60f8

* commit '8da57a60f8e1a61a2e835fb95fd2049a12021a6d':
  Update work challenge background image.

Change-Id: Ie1f18ff1c0eaee38362b1432fc26698ecca79ce3
 2016-05-19 11:14:37 +00:00
Android Build Merger (Role)
5e01c6c2f6 Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 am: cdc59c8709" into nyc-mr1-dev-plus-aosp 2016-05-19 11:11:22 +00:00
Kenny Guy
a848b1048f Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 
am: cdc59c8709

* commit 'cdc59c87090f16afbc4336062ce371317b2def0b':
  Update work challenge background image.

Change-Id: I266f8e0be6ddf4135bf0a11694210a1639df2762
 2016-05-19 11:11:10 +00:00
Kenny Guy
8da57a60f8 Merge "Update work challenge background image." into nyc-dev am: 726085c5c7 
am: 01891c5bf0

* commit '01891c5bf07db8df50bac4b3f21744187815557e':
  Update work challenge background image.

Change-Id: I7f41624bd0918f9127c934cfaf15e8762be35c0a
 2016-05-19 11:11:08 +00:00
Kenny Guy
cdc59c8709 Merge "Update work challenge background image." into nyc-dev 
am: 726085c5c7

* commit '726085c5c7016a828850580a21e09d2330a20ce4':
  Update work challenge background image.

Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
 2016-05-19 11:07:59 +00:00
Kenny Guy
01891c5bf0 Merge "Update work challenge background image." into nyc-dev 
am: 726085c5c7

* commit '726085c5c7016a828850580a21e09d2330a20ce4':
  Update work challenge background image.

Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
 2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7 Merge "Update work challenge background image." into nyc-dev 2016-05-19 11:01:37 +00:00
TreeHugger Robot
35a058ce8c Merge "Display total storage for Internal shared storage." 2016-05-18 22:35:27 +00:00
Baligh Uddin
b761e10ef1 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633 -s ours am: 43a6de268d -s ours 
am: fe73d01eba  -s ours

* commit 'fe73d01ebab81ef85b4eda15d8ba0d6b2144be4f':

Change-Id: I0703aa0325715f5879a48bd05531d0849a9f078e
 2016-05-18 19:30:43 +00:00
Baligh Uddin
9ceab5183a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633 -s ours am: 5736532e19 -s ours 
am: 9a0da1eb79  -s ours

* commit '9a0da1eb79e132bd0ae7450da11e5e606a64e5fc':
  Import translations. DO NOT MERGE

Change-Id: I5ed8201864c9d27c9e9d7fc865680498373457ae
 2016-05-18 19:30:42 +00:00
Baligh Uddin
fe73d01eba Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633 -s ours 
am: 43a6de268d  -s ours

* commit '43a6de268d5996f94eaa3c7f154a7cdf5d2c46a4':

Change-Id: I86c55dd3e0a2d2dc926e0599b63d2f53e04b0dc3
 2016-05-18 19:25:03 +00:00
Baligh Uddin
9a0da1eb79 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633 -s ours 
am: 5736532e19  -s ours

* commit '5736532e1944c56a2a6ab0f71fbb4d1dc09cfc5d':
  Import translations. DO NOT MERGE

Change-Id: I1aa08062675ddd931a23f74103a90a1875af4b19
 2016-05-18 19:22:30 +00:00
Baligh Uddin
9d64c9c344 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: be840c80cb -s ours 
am: 59d13e52d9  -s ours

* commit '59d13e52d904ee2f07e2d2eb9452616681a4199a':
  Import translations. DO NOT MERGE

Change-Id: I764e55ad97c2114148d96bda0110d956670b970f
 2016-05-18 19:19:58 +00:00
Baligh Uddin
5736532e19 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7ffeda3633  -s ours

* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
  Import translations. DO NOT MERGE

Change-Id: I49ec349b40cbc6715479d3b0968337f05d4f9b12
 2016-05-18 19:17:05 +00:00
Baligh Uddin
59d13e52d9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: be840c80cb  -s ours

* commit 'be840c80cbf79a06a82acea65035f35c51a4cdac':
  Import translations. DO NOT MERGE

Change-Id: I62c4f546f41886284b4c4b1c5c4c3b96b0ba23a8
 2016-05-18 19:14:15 +00:00
Baligh Uddin
43a6de268d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7ffeda3633  -s ours

* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
  Import translations. DO NOT MERGE

Change-Id: I613a4c8aba7a51e232985f6025660c71f8dab169
 2016-05-18 19:13:59 +00:00
Baligh Uddin
7ffeda3633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 19:06:53 +00:00
Baligh Uddin
be840c80cb Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 19:06:48 +00:00
Baligh Uddin
946a0ead3c Merge "Import translations. DO NOT MERGE" 2016-05-18 18:56:47 +00:00
Robert Greenwalt
ed25cd454f Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 am: eb88257f07 am: aae2022cb5 
am: dd433d73e7

* commit 'dd433d73e79970da5e5e034fe1b7315197c75960':
  Fix register multiple PhoneStateListeners.

Change-Id: I03b5b9c8a02756613a39821368cff6de6fb1b3df
 2016-05-18 18:28:34 +00:00
yifan.bai
dd433d73e7 Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 am: eb88257f07 
am: aae2022cb5

* commit 'aae2022cb593e1e96d7629b9c76a6eb5a58db4ff':
  Fix register multiple PhoneStateListeners.

Change-Id: I5e2d8a59bda82246af553e16f98e7827ae6f99ef
 2016-05-18 18:14:24 +00:00
Robert Greenwalt
aae2022cb5 Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 
am: eb88257f07

* commit 'eb88257f076323771fd1e9805708441efc2af03f':
  Fix register multiple PhoneStateListeners.

Change-Id: Iece8c8bd197ed03835720f31174c710495a5998f
 2016-05-18 18:06:49 +00:00
yifan.bai
eb88257f07 Merge "Fix register multiple PhoneStateListeners." 
am: 91f6b496a9

* commit '91f6b496a99e085d853d684485c8486125f83f45':
  Fix register multiple PhoneStateListeners.

Change-Id: I00a37f58a9f2eccb138bbbdee2bc05323e05237a
 2016-05-18 18:02:56 +00:00
Robert Greenwalt
91f6b496a9 Merge "Fix register multiple PhoneStateListeners." 2016-05-18 17:54:47 +00:00
Kenny Guy
846e182385 Update work challenge background image. 
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.

Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
 2016-05-18 16:14:19 +01:00
Julia Reynolds
c6e50d7b66 Merge "Merge "Null check." into nyc-dev am: fc1bb74186 am: 1ca6867e35" into nyc-mr1-dev-plus-aosp 
am: a638e869f1

* commit 'a638e869f1ec02f4f49e263cefdae99d30e53a86':

Change-Id: I196f70728ccfb0921e8175d1a55362bf261ee8bc
 2016-05-18 14:15:12 +00:00
Julia Reynolds
29b7d0f73a Merge "Null check." into nyc-dev am: fc1bb74186 am: d6575bcee2 
am: e16aed4db5

* commit 'e16aed4db52ab55f88bd01436336732c49b19a65':
  Null check.

Change-Id: I8231667d7c3c93d018a72b7f9f60e6f922880470
 2016-05-18 14:15:11 +00:00
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
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