PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,318 Commits 1 Branch 0 Tags
09ddca8ffe2e743b116fa1f9a53faf21acb3ea51
Commit Graph

21318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Francis-Lyon
09ddca8ffe am af02ae0f: am d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup is disabled 
* commit 'af02ae0fb7d41435531d185031a2e27952c113a4':
  show old legal text in backup settings if full data backup is disabled
 2015-06-16 01:49:46 +00:00
Sean Francis-Lyon
af02ae0fb7 am d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup is disabled 
* commit 'd1f4be219d68179c0aea245e7b66d393444688a7':
  show old legal text in backup settings if full data backup is disabled
 2015-06-16 01:42:58 +00:00
Sean Francis-Lyon
d1f4be219d am c44d0ef1: show old legal text in backup settings if full data backup is disabled 
* commit 'c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
  show old legal text in backup settings if full data backup is disabled
 2015-06-16 01:32:02 +00:00
Sean Francis-Lyon
c44d0ef1dc show old legal text in backup settings if full data backup is disabled 
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
 2015-06-15 18:11:41 -07:00
Adrian Roos
0bc0352fc9 am b57ca0ac: am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev 
* commit 'b57ca0aceaed55b67b91e3fc6d610503c2a1ac0b':
  Use AssistUtils.getAssistInfo
 2015-06-16 00:18:16 +00:00
Adrian Roos
b57ca0acea am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev 
* commit '5d912c353145b893f4175fdff1ab488b0265cd4b':
  Use AssistUtils.getAssistInfo
 2015-06-16 00:05:17 +00:00
Adrian Roos
5d912c3531 am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev 
* commit 'bada978ec3eab48564c29eb4f8169e88975a2da0':
  Use AssistUtils.getAssistInfo
 2015-06-15 23:56:53 +00:00
Adrian Roos
bada978ec3 Merge "Use AssistUtils.getAssistInfo" into mnc-dev 2015-06-15 23:49:19 +00:00
Adrian Roos
b627370e85 Use AssistUtils.getAssistInfo 
Use consistent logic with SystemUI for determining
default assist component.

Bug: 21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
 2015-06-15 16:15:24 -07:00
Amit Mahajan
4ff981c536 am 32d93f34: am 5282bd71: am be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev 
* commit '32d93f349141ba1be95009dcb7abec121a13595f':
  Change to trigger client initiated OMA-DM session on System update req.
 2015-06-15 22:50:10 +00:00
Amit Mahajan
32d93f3491 am 5282bd71: am be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev 
* commit '5282bd71c9128bd53703b3381be0697afc7baf2a':
  Change to trigger client initiated OMA-DM session on System update req.
 2015-06-15 22:39:02 +00:00
Amit Mahajan
5282bd71c9 am be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev 
* commit 'be1b22e88ee24a9d53c1871da360cf7b56f4da0b':
  Change to trigger client initiated OMA-DM session on System update req.
 2015-06-15 22:29:00 +00:00
Amit Mahajan
be1b22e88e Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev 2015-06-15 22:16:38 +00:00
John Spurlock
7daab48484 am f2903eda: am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit 'f2903edadcc785135fb07a26655bf80476da35ab':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 20:14:24 +00:00
John Spurlock
f2903edadc am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit '3fdfabcd4576b27c37608656c277686d73833b57':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 20:01:55 +00:00
Dianne Hackborn
9c1962845a am f4d4440f: am f7c184f0: am 3f98c0ce: Fix issue #21813831: Need API for asking to be added to power whitelist 
* commit 'f4d4440fd4318a83ce83090a744171e336d6fd65':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:49:39 +00:00
John Spurlock
3fdfabcd45 am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit 'dddd589d8f0de00c192022ea9bd87f32a734343b':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 19:49:30 +00:00
Dianne Hackborn
f4d4440fd4 am f7c184f0: am 3f98c0ce: Fix issue #21813831: Need API for asking to be added to power whitelist 
* commit 'f7c184f05e4f2c70835dfb7da48cc1a95e38a6e4':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:37:09 +00:00
John Spurlock
dddd589d8f Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 2015-06-15 19:36:46 +00:00
John Spurlock
dae8c154f0 Settings: Remove unreachable "Battery Info" screen. 
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
 2015-06-15 15:24:16 -04:00
Dianne Hackborn
f7c184f05e am 3f98c0ce: Fix issue #21813831: Need API for asking to be added to power whitelist 
* commit '3f98c0ce510ba95f8ecb3d815a4e722002fcf9f2':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:24:10 +00:00
Dianne Hackborn
3f98c0ce51 Fix issue #21813831: Need API for asking to be added to power whitelist 
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.

You can now launch the whitelist without specifying an app to just
get the regular UI.

Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
 2015-06-15 11:54:03 -07:00
Geoff Mendal
431aa064f0 am f665e53c: (-s ours) am 920a4b62: (-s ours) am f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f665e53c88ebaae27783787c34bead2575c3501a':
  Import translations. DO NOT MERGE
 2015-06-15 16:08:08 +00:00
Geoff Mendal
f665e53c88 am 920a4b62: (-s ours) am f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '920a4b62a36ec9a1e64e6a559425ec03ff760801':
  Import translations. DO NOT MERGE
 2015-06-15 15:59:44 +00:00
Geoff Mendal
920a4b62a3 am f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f4d7bd4f49077602c7d3fd096fe32b2b17f76797':
  Import translations. DO NOT MERGE
 2015-06-15 15:48:55 +00:00
Geoff Mendal
f4d7bd4f49 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 15:36:59 +00:00
Jason Monk
b7d220581e am d6e65040: am dfe186f5: am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit 'd6e65040f5030a5b2c3db29ca5f5f8735fcdecec':
  Fix bad theming on owner-info
 2015-06-15 15:36:21 +00:00
Jason Monk
3946f18abd am 89a770fb: am f7b0dfd6: am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev 
* commit '89a770fb3bd86e4089e7858664380c7d7f21e578':
  Don't auto-focus text fields in hotspot dialog
 2015-06-15 15:24:58 +00:00
Jason Monk
d6e65040f5 am dfe186f5: am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit 'dfe186f57c4f8cc04ca3b179e3dcae6d6c76fbc0':
  Fix bad theming on owner-info
 2015-06-15 15:24:53 +00:00
Jason Monk
89a770fb3b am f7b0dfd6: am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev 
* commit 'f7b0dfd6aeff9c02e479c2ce6f2ddc97baa09331':
  Don't auto-focus text fields in hotspot dialog
 2015-06-15 15:12:48 +00:00
Jason Monk
dfe186f57c am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit '49ecfcd690a73112024df188924892772408d170':
  Fix bad theming on owner-info
 2015-06-15 15:11:59 +00:00
Jason Monk
49ecfcd690 Merge "Fix bad theming on owner-info" into mnc-dev 2015-06-15 15:05:34 +00:00
Jason Monk
39eee0c55c Fix bad theming on owner-info 
Bug: 21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
 2015-06-15 15:05:11 +00:00
Jason Monk
f7b0dfd6ae am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev 
* commit 'f0fe5c58e2274a550321f936c125c691f7a1646b':
  Don't auto-focus text fields in hotspot dialog
 2015-06-15 15:00:20 +00:00
Geoff Mendal
b59e4e4df4 Import translations. DO NOT MERGE 
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
 2015-06-15 07:57:05 -07:00
Jason Monk
f0fe5c58e2 Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev 2015-06-15 14:51:28 +00:00
Jason Monk
3fd29f0697 am 637cb00c: am 20a837ea: am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev 
* commit '637cb00c9db191b8052d9aa26e6e873a05d4f1b9':
  Handle switch of ssid to CharSequence (for spans)
 2015-06-15 14:48:00 +00:00
Jason Monk
6b4a31c219 Don't auto-focus text fields in hotspot dialog 
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.

Bug: 19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
 2015-06-15 10:45:46 -04:00
Jason Monk
637cb00c9d am 20a837ea: am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev 
* commit '20a837ea52a77efa578aef58b7e108f59c3a8bcb':
  Handle switch of ssid to CharSequence (for spans)
 2015-06-15 14:35:25 +00:00
Geoff Mendal
ef7658713f Merge "Import translations. DO NOT MERGE" 2015-06-15 14:32:29 +00:00
Geoff Mendal
d0ee913a5c Import translations. DO NOT MERGE 
Change-Id: Idb22432cce54225e2d9f02976473953daa7db514
Auto-generated-cl: translation import
 2015-06-15 07:26:30 -07:00
Jason Monk
20a837ea52 am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev 
* commit '6f229435367e6b5a775f42552be280fa35df1d56':
  Handle switch of ssid to CharSequence (for spans)
 2015-06-15 14:23:54 +00:00
Jason Monk
6f22943536 Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev 2015-06-15 14:14:56 +00:00
Paul Jensen
e6ccd96efe am 2d3f521f: am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '2d3f521fe7fc8880c3fe0d9d19d471d9be8b15a3':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-15 14:11:13 +00:00
Jason Monk
c68b46c1f2 Handle switch of ssid to CharSequence (for spans) 
Change to reference the string directly for places like search,
etc.

Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
 2015-06-15 10:09:55 -04:00
Paul Jensen
2d3f521fe7 am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '020dc2e151c49e01da86a7bc597d5d8dd3ef335c':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-15 13:58:58 +00:00
Paul Jensen
020dc2e151 am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 
* commit '04e3fca391b9d4fd0493f7ef38ab4f9b8ddafa95':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
 2015-06-15 13:45:21 +00:00
Paul Jensen
04e3fca391 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-15 13:36:58 +00:00
Jeff Sharkey
1d3f9bccdf am 89751b05: am 7384b67e: am edb7b0d9: New storage dialogs. 
* commit '89751b0571f37d5eaea5b0c2e34a333ec8f638cc':
  New storage dialogs.
 2015-06-15 04:44:40 +00:00
Jeff Sharkey
89751b0571 am 7384b67e: am edb7b0d9: New storage dialogs. 
* commit '7384b67e159eed75a6e8744da27ee3eaa2ed308a':
  New storage dialogs.
 2015-06-15 04:32:54 +00:00