PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,851 Commits 1 Branch 0 Tags
2d8b9f8fa8dba1dde07f5b35f052277cc3b09c41
Commit Graph

26851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
dc67434fd8 Merge "Notification summary updates." into nyc-dev am: 5354f8a2d0 
am: 1d91e0f910

* commit '1d91e0f910729b1107653009489f696201a45f57':
  Notification summary updates.
 2016-03-08 21:42:55 +00:00
Julia Reynolds
179a57b21f Merge "Don't reference framework strings." into nyc-dev 2016-03-08 21:41:59 +00:00
Julia Reynolds
5f5d049e00 Don't reference framework strings. 
Bug: 27513548
Change-Id: Ia459d540ebcb81c8a6d6b045e71141aef849d1f1
 2016-03-08 16:37:32 -05:00
Julia Reynolds
f830adddb8 Merge "Don\'t reference the notification led if it doesn\'t exist." into nyc-dev 
am: d3c07da6e9

* commit 'd3c07da6e916c128b20adee3c1ccfd845725cdee':
  Don't reference the notification led if it doesn't exist.
 2016-03-08 21:32:24 +00:00
Julia Reynolds
d3c07da6e9 Merge "Don't reference the notification led if it doesn't exist." into nyc-dev 2016-03-08 21:26:39 +00:00
Julia Reynolds
1d91e0f910 Merge "Notification summary updates." into nyc-dev 
am: 5354f8a2d0

* commit '5354f8a2d097f6e67917e94dc019ac8ded8280db':
  Notification summary updates.
 2016-03-08 21:25:02 +00:00
Julia Reynolds
184da33bba Don't reference the notification led if it doesn't exist. 
Bug: 27318491
Change-Id: Ic43f1e8c0c7cf376b19278ab6c2661abc1052ddb
 2016-03-08 16:23:03 -05:00
Julia Reynolds
5354f8a2d0 Merge "Notification summary updates." into nyc-dev 2016-03-08 21:08:55 +00:00
Julia Reynolds
3e912e7ea5 Notification summary updates. 
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
 2016-03-08 16:08:12 -05:00
Anna Galusza
6cb8b62bae Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev am: 0cb68d4dff 
am: 79bc5ece6e

* commit '79bc5ece6e52a1399faf704fb5d3bed37ae82248':
  Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637
 2016-03-08 20:50:58 +00:00
Anna Galusza
79bc5ece6e Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev 
am: 0cb68d4dff

* commit '0cb68d4dff3a5a348a8e99dc9f808d7d584b1f10':
  Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637
 2016-03-08 20:46:00 +00:00
Anna Galusza
0cb68d4dff Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug: 27326637" into nyc-dev 2016-03-08 20:37:34 +00:00
Jason Monk
f8a08a2ac5 Fix SummaryLoader lifecycle second and for all am: 9425839379 
am: 4a93400a02

* commit '4a93400a02e4abd5e3e99245cb31da0c6d0df50e':
  Fix SummaryLoader lifecycle second and for all
 2016-03-08 19:52:31 +00:00
Jason Monk
3e19fc5600 Move temporary metrics constants to proto 
Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
 2016-03-08 14:18:30 -05:00
Jason Monk
4a93400a02 Fix SummaryLoader lifecycle second and for all 
am: 9425839379

* commit '9425839379d862604d4b5a7b9161540f598f64f6':
  Fix SummaryLoader lifecycle second and for all
 2016-03-08 18:26:08 +00:00
Jason Monk
9425839379 Fix SummaryLoader lifecycle second and for all 
Mostly hypothetical fix for weird circumstance where listening
lifecycle gets broken.  To fix this, track the current state
of listening in the SummaryLoader and force it into the non-listening
state when released.

Bug: 26027137
Bug: 26731143
Change-Id: I7299749230924eafa3e6e7d5b0de6e48ff014a38
 2016-03-08 13:14:27 -05:00
Udam Saini
84b7e86cf1 Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev am: 4695fc7e48 
am: 704ea2ddef

* commit '704ea2ddeffe243136de770899ae21c297a49fc1':
  Fixes a crash in setup wizard when adding a lock screen.
 2016-03-08 02:03:24 +00:00
Udam Saini
704ea2ddef Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev 
am: 4695fc7e48

* commit '4695fc7e484bdc76ca9bd3d6b04a72f82a559f41':
  Fixes a crash in setup wizard when adding a lock screen.
 2016-03-08 02:01:27 +00:00
Udam Saini
4695fc7e48 Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev 2016-03-08 01:55:00 +00:00
Udam Saini
6d6e117720 Fixes a crash in setup wizard when adding a lock screen. 
bug:27528834
Change-Id: Idc06850740695669162e239f28c30a1ddad6d2df
 2016-03-07 17:50:40 -08:00
Ruben Brunk
f584fe7493 Merge "Add settings VR listener service." into nyc-dev am: 31a3b770c7 
am: caab7e72cd

* commit 'caab7e72cd664bc3f55aaeef2b07f22ba4c43341':
  Add settings VR listener service.
 2016-03-08 00:30:55 +00:00
Ruben Brunk
caab7e72cd Merge "Add settings VR listener service." into nyc-dev 
am: 31a3b770c7

* commit '31a3b770c7f50f9e7038759f189b33761301281d':
  Add settings VR listener service.
 2016-03-08 00:26:36 +00:00
Ruben Brunk
31a3b770c7 Merge "Add settings VR listener service." into nyc-dev 2016-03-08 00:14:56 +00:00
Philip P. Moltmann
75c52e2442 Deal with the case that no print services are installed. am: 7833d183e7 
am: d7b46f9763

* commit 'd7b46f9763ae872a9a534b64d4551eb00a95c6e6':
  Deal with the case that no print services are installed.
 2016-03-08 00:03:27 +00:00
Philip P. Moltmann
d7b46f9763 Deal with the case that no print services are installed. 
am: 7833d183e7

* commit '7833d183e7ddeaf08938b9db6d8714185e11901f':
  Deal with the case that no print services are installed.
 2016-03-07 23:59:31 +00:00
Rebecca Silberstein
d78524e055 Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev am: da9957780b 
am: c17425bfb0

* commit 'c17425bfb0e311319287cd8f8e605ccfa04843d7':
  Save WifiAp config changes when hotspot is enabled
 2016-03-07 23:38:59 +00:00
Rebecca Silberstein
c17425bfb0 Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev 
am: da9957780b

* commit 'da9957780b71a17b81e25213053f45be73564f03':
  Save WifiAp config changes when hotspot is enabled
 2016-03-07 23:37:07 +00:00
Philip P. Moltmann
7833d183e7 Deal with the case that no print services are installed. 
Bug: 27530312
Change-Id: Idd709e66d72efcca4928b471f138f8be66e7ab00
 2016-03-07 15:32:28 -08:00
Rebecca Silberstein
da9957780b Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev 2016-03-07 23:29:39 +00:00
Fyodor Kupolov
ab0a3706db Merge "First time populate user list in onCreate" into nyc-dev am: f38d2b6d4c 
am: c2f50fc4f3

* commit 'c2f50fc4f3c2dc6fd040e167e49048736192b686':
  First time populate user list in onCreate
 2016-03-07 21:43:02 +00:00
Jim Miller
4441b872dd Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev am: fb51827247 
am: 76f9181061

* commit '76f9181061f550dc5de51ec9bed9c9d1ce9375b0':
  Fix crash in fingerprint enrollment due to async transaction
 2016-03-07 21:42:50 +00:00
Adrian Roos
b426b627eb Merge "Fix SUW redaction interstitial crash" into nyc-dev am: bd705413ba 
am: d24f3d9fa9

* commit 'd24f3d9fa9b83f1890e996f6ca6a054410bf59dd':
  Fix SUW redaction interstitial crash
 2016-03-07 21:42:37 +00:00
Ido Ofir
7882b5aaf6 Merge "mark categories as complete when disabled." into nyc-dev am: b46cad2cb7 
am: 67297db8f8

* commit '67297db8f82b5c3474aa0848c1721602d789d21b':
  mark categories as complete when disabled.
 2016-03-07 21:42:23 +00:00
Fyodor Kupolov
c2f50fc4f3 Merge "First time populate user list in onCreate" into nyc-dev 
am: f38d2b6d4c

* commit 'f38d2b6d4c96c42c7168545e6f4f4aecc67b092b':
  First time populate user list in onCreate
 2016-03-07 21:40:59 +00:00
Jim Miller
76f9181061 Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev 
am: fb51827247

* commit 'fb51827247de116c184e7fef31978f4f8541194f':
  Fix crash in fingerprint enrollment due to async transaction
 2016-03-07 21:40:44 +00:00
Adrian Roos
d24f3d9fa9 Merge "Fix SUW redaction interstitial crash" into nyc-dev 
am: bd705413ba

* commit 'bd705413babe94c3382598217757d4b95d2dcc6a':
  Fix SUW redaction interstitial crash
 2016-03-07 21:40:29 +00:00
Ido Ofir
67297db8f8 Merge "mark categories as complete when disabled." into nyc-dev 
am: b46cad2cb7

* commit 'b46cad2cb7dfdb283ac8c118723c8bc4f2c4633c':
  mark categories as complete when disabled.
 2016-03-07 21:40:13 +00:00
Fyodor Kupolov
f38d2b6d4c Merge "First time populate user list in onCreate" into nyc-dev 2016-03-07 21:20:18 +00:00
Fyodor Kupolov
8c9120b9cc First time populate user list in onCreate 
Call updateUserList from onCreate instead of onResume during initialization.
This will suppress unnecessary animations.

Bug: 27527929

Change-Id: Ia420f41894b2033fb7f02de01168ccd2c6331588
 2016-03-07 13:08:49 -08:00
Jim Miller
fb51827247 Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev 2016-03-07 20:55:38 +00:00
Adrian Roos
bd705413ba Merge "Fix SUW redaction interstitial crash" into nyc-dev 2016-03-07 20:50:05 +00:00
Adrian Roos
0128d6d28b Fix SUW redaction interstitial crash 
Bug: 27518157
Change-Id: Id0c2eae88db41080e35200ee8f94ee74ea0a9a1f
 2016-03-07 12:49:25 -08:00
Ido Ofir
b46cad2cb7 Merge "mark categories as complete when disabled." into nyc-dev 2016-03-07 20:05:25 +00:00
Philip P. Moltmann
486f9c6117 Make Print Settings use the new PrintManager.getPrintServices loader am: d9779db8c9 
am: 00c3ed1a7a

* commit '00c3ed1a7abdd49b0274f29968e4ce30b0e4c902':
  Make Print Settings use the new PrintManager.getPrintServices loader
 2016-03-07 19:19:18 +00:00
Philip P. Moltmann
00c3ed1a7a Make Print Settings use the new PrintManager.getPrintServices loader 
am: d9779db8c9

* commit 'd9779db8c966347734c5791cf63b7dc2e466a0f4':
  Make Print Settings use the new PrintManager.getPrintServices loader
 2016-03-07 19:17:31 +00:00
Rebecca Silberstein
ffb4fbb1a7 Save WifiAp config changes when hotspot is enabled 
We need to properly handle asynchronous events when WifiAp for hotspot
is enabled and the user changes the config.  This CL changes the
behavior to:
1 - mark local boolean indicating a restart is needed
2 - trigger the WifiAp to stop
3 - save the new config
4 - when the stop is complete (and the boolean is set), restart the
WifiAp.

Also fix a few style issues in the file.

BUG:27460194
Change-Id: I7e49ab9c49e125017cf83866a396701e440bf383
 2016-03-07 09:49:52 -08:00
Philip P. Moltmann
d9779db8c9 Make Print Settings use the new PrintManager.getPrintServices loader 
This makes sure that all data always stays up to date.

printer_dropdown_item.xml:
- Reduce the amount of overriden properties

PrintServiceSettingsFragment:
- Instead receiving most data from PrintSettingsFragment have own loader
  and keep data up to date
- Also the updating of the print service state now has a dedicated
  PrintManager call instead of relying of the Settings-ContentObserver
  to transport this information. No more race-conditions, whohoo!

DynamicIndexableContentMonitor:
- To not rewrite too much code the update logic has to live here but the
  reading of the actual data is in PrintSettingsFragment.

Change-Id: I60715cda8952565d7f68cb24fb7da61a37085887
 2016-03-07 09:32:55 -08:00
Oleksandr Peletskyi
61cf59927c Merge "Block "Screen lock" menu if password is managed." into nyc-dev am: 52fdd6a058 
am: 062ca07e7c

* commit '062ca07e7c78afb52e9d50f9eced507f03b944f2':
  Block "Screen lock" menu if password is managed.
 2016-03-07 16:58:38 +00:00
Geoff Mendal
ae2b0a0ff7 Merge "Import translations. DO NOT MERGE" into nyc-dev am: c654adf99c -s ours 
am: de12d181f6  -s ours

* commit 'de12d181f6ee6f776060d39dc575965f9b0df7f4':
  Import translations. DO NOT MERGE
 2016-03-07 16:58:21 +00:00
Jason Monk
008fdcf656 Fix add network alignment am: ebfbe5cfe6 
am: 86aa79b60f

* commit '86aa79b60fa067a4520472334adb03f89cca95ae':
  Fix add network alignment
 2016-03-07 16:58:05 +00:00