PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,586 Commits 1 Branch 0 Tags
c72930e51a59b711731494446a0f09bd7daa9965
Commit Graph

20586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
c72930e51a am ad17aea7: am d070d52a: am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 
* commit 'ad17aea79d1b88bcada71cfda3ac616ad1755543':
  Settings: Display corp profile calendars in event rule selection.
 2015-05-26 20:23:13 +00:00
John Spurlock
ad17aea79d am d070d52a: am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 
* commit 'd070d52a7b8d9cf96fe96027cb089ab5d999c7c9':
  Settings: Display corp profile calendars in event rule selection.
 2015-05-26 20:08:28 +00:00
John Spurlock
d070d52a7b am 90f5f4cb: Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 
* commit '90f5f4cbd1099d2afe993fff0bc7c620a64f1576':
  Settings: Display corp profile calendars in event rule selection.
 2015-05-26 19:55:32 +00:00
Jason Monk
ff24d5d941 am 969b5842: am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev 
* commit '969b58420fbe5620a367e134f9cc1b15aa773365':
  Fix crash while rotating with app info dialog up
 2015-05-26 19:55:20 +00:00
Jason Monk
969b58420f am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev 
* commit '49ad08e20fda90f03bb89ba395a6d14d00406a25':
  Fix crash while rotating with app info dialog up
 2015-05-26 19:42:10 +00:00
John Spurlock
90f5f4cbd1 Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev 2015-05-26 19:41:55 +00:00
Jason Monk
49ad08e20f am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev 
* commit '1ecfc645ee74ddcc7555f44291943f75581a4f8e':
  Fix crash while rotating with app info dialog up
 2015-05-26 19:29:22 +00:00
Jason Monk
1ecfc645ee Merge "Fix crash while rotating with app info dialog up" into mnc-dev 2015-05-26 19:22:18 +00:00
Sanket Padawe
6c30d05691 am 9c62ddec: am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 
* commit '9c62ddeca6de29eb6cfd2129cbe69c41046c5bdb':
  Fix generation of pin for WPS on screen rotation.
 2015-05-26 19:17:16 +00:00
Jason Monk
5e2529aeb4 Fix crash while rotating with app info dialog up 
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
 2015-05-26 15:12:18 -04:00
Sanket Padawe
9c62ddeca6 am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 
* commit '86dbdff1fa203b415929fb6c65fa431d56e7eaa8':
  Fix generation of pin for WPS on screen rotation.
 2015-05-26 19:09:29 +00:00
Sanket Padawe
86dbdff1fa am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 
* commit '6d9500d04c64d05ad0b9b054c72b0e2fd1b866fc':
  Fix generation of pin for WPS on screen rotation.
 2015-05-26 18:58:07 +00:00
Sanket Padawe
6d9500d04c Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 2015-05-26 18:46:04 +00:00
Jason Monk
e224c39795 am 1737c2e5: am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '1737c2e5ef093a4db2ec1ede8ad523e62ce1f61f':
  Unbanish memory screen and new UX
 2015-05-26 17:28:16 +00:00
Jason Monk
1737c2e5ef am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '5b1c03293c5e0914f773644b2958d321dc83afbe':
  Unbanish memory screen and new UX
 2015-05-26 17:13:47 +00:00
Jason Monk
05ce384b62 am 28d03835: am 3f058ca1: am e9866b6d: Add permission summaries back in 
* commit '28d03835abd1cccaa958c9832063103b3e8d8d3c':
  Add permission summaries back in
 2015-05-26 17:06:02 +00:00
Jason Monk
5b1c03293c am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev 
* commit '7231147b567aaf1c495eae569723c5dd7268c9e0':
  Unbanish memory screen and new UX
 2015-05-26 17:05:18 +00:00
John Spurlock
fa76a652e4 Settings: Display corp profile calendars in event rule selection. 
And sort the accounts by display name.

Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3
 2015-05-26 12:55:56 -04:00
Jason Monk
7231147b56 Merge "Unbanish memory screen and new UX" into mnc-dev 2015-05-26 16:55:42 +00:00
Jason Monk
28d03835ab am 3f058ca1: am e9866b6d: Add permission summaries back in 
* commit '3f058ca1c8f1a03b8c476c2e87163682f8c266d6':
  Add permission summaries back in
 2015-05-26 16:53:30 +00:00
Jason Monk
3f058ca1c8 am e9866b6d: Add permission summaries back in 
* commit 'e9866b6dc47201630c057f946423d572b8c46af8':
  Add permission summaries back in
 2015-05-26 16:41:42 +00:00
Jason Monk
beb171d2e5 Unbanish memory screen and new UX 
Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.

Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa
 2015-05-26 11:41:37 -04:00
Jason Monk
e9866b6dc4 Add permission summaries back in 
Use broadcasts to ask the PackageInstaller about the number of
granted permissions.

Bug: 21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943
 2015-05-26 10:28:21 -04:00
Geoff Mendal
a3fbdd94eb am 88cb413e: (-s ours) am eec23776: (-s ours) am 85a72a90: (-s ours) Import translations. DO NOT MERGE 
* commit '88cb413ebe4108df05bc068444fe5c5db752f3ee':
  Import translations. DO NOT MERGE
 2015-05-25 16:34:59 +00:00
Geoff Mendal
88cb413ebe am eec23776: (-s ours) am 85a72a90: (-s ours) Import translations. DO NOT MERGE 
* commit 'eec237769a8af11dd5e2b2eaf40ae6f6c893661a':
  Import translations. DO NOT MERGE
 2015-05-25 16:22:33 +00:00
Geoff Mendal
eec237769a am 85a72a90: (-s ours) Import translations. DO NOT MERGE 
* commit '85a72a9088d6be0cd0fda03d0e80a24a8fcaa4cb':
  Import translations. DO NOT MERGE
 2015-05-25 16:11:25 +00:00
Geoff Mendal
85a72a9088 Import translations. DO NOT MERGE 
Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import
 2015-05-25 08:57:08 -07:00
Geoff Mendal
23d49e0c75 Import translations. DO NOT MERGE 
Change-Id: I62198fa72a594fd159fcd25478468779ec62b3e0
Auto-generated-cl: translation import
 2015-05-25 08:20:07 -07:00
Sean Francis-Lyon
8c106a3c57 am ab400026: (-s ours) am 19c39d27: am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev 
* commit 'ab400026df3a4c84d193179f2d07b03405f205da':
  DO NOT MERGE show correct backup status
 2015-05-22 22:23:43 +00:00
Sean Francis-Lyon
ab400026df am 19c39d27: am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev 
* commit '19c39d275dcbe8453776185f5533ad50146c13ac':
  DO NOT MERGE show correct backup status
 2015-05-22 22:09:40 +00:00
Maurice Lam
90d35bfaf9 am 73f865bf: am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 
* commit '73f865bf8dc8eef9dd6daa15289fb3d389b8cf90':
  [WifiSetup] Align to mac address to locale start
 2015-05-22 21:42:37 +00:00
Maurice Lam
2f019c6194 am 0640ad68: am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev 
* commit '0640ad681434e2e2efb183f6b59d08516fe9bdf8':
  [WifiSetup] Update phone illustrations
 2015-05-22 21:42:35 +00:00
Jason Monk
cc6e9ae9c7 am 2821a373: am cf55da1e: am b2f11d01: String changes for app links in settings 
* commit '2821a373edf50b054e8a68565dbec5a3774dbb56':
  String changes for app links in settings
 2015-05-22 21:41:59 +00:00
Sean Francis-Lyon
19c39d275d am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev 
* commit '389cf343805c0d40af720a06ead6e92bdd512527':
  DO NOT MERGE show correct backup status
 2015-05-22 20:51:50 +00:00
Sean Francis-Lyon
389cf34380 Merge "DO NOT MERGE show correct backup status" into mnc-dev 2015-05-22 20:38:41 +00:00
Maurice Lam
73f865bf8d am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 
* commit 'b2c02e2709456ebdb10b55d9f97f5db1892e239e':
  [WifiSetup] Align to mac address to locale start
 2015-05-22 19:48:05 +00:00
Maurice Lam
0640ad6814 am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev 
* commit 'db0e8b65e0a1e15521b93744512933197b32fba7':
  [WifiSetup] Update phone illustrations
 2015-05-22 19:48:04 +00:00
Maurice Lam
b2c02e2709 am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 
* commit 'df8d8907a867e4d93f42d0a305371124b4fd599d':
  [WifiSetup] Align to mac address to locale start
 2015-05-22 19:35:30 +00:00
Maurice Lam
db0e8b65e0 am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev 
* commit '6fdd06dcfc82a246911b1b285b4b6e4f41d0b8fc':
  [WifiSetup] Update phone illustrations
 2015-05-22 19:35:29 +00:00
Maurice Lam
df8d8907a8 Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 2015-05-22 19:33:19 +00:00
Maurice Lam
6fdd06dcfc Merge "[WifiSetup] Update phone illustrations" into mnc-dev 2015-05-22 19:27:10 +00:00
Jason Monk
2821a373ed am cf55da1e: am b2f11d01: String changes for app links in settings 
* commit 'cf55da1ef517e63a6903e0730683d938cfbcf05c':
  String changes for app links in settings
 2015-05-22 19:11:52 +00:00
Maurice Lam
cd3fbba9b7 [WifiSetup] Align to mac address to locale start 
Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.

Bug: 21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930
 2015-05-22 11:59:43 -07:00
Jason Monk
cf55da1ef5 am b2f11d01: String changes for app links in settings 
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
  String changes for app links in settings
 2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c String changes for app links in settings 
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
 2015-05-22 14:42:45 -04:00
Maurice Lam
65079b2d3c [WifiSetup] Update phone illustrations 
Update illustrations in phone layout, to move the buildings up so
that they are not shown when the header is sticky.

Bug: 20954868
Change-Id: I3db4ac19901b5e5fdaeef3bdabe94e81e40b159c
 2015-05-22 11:30:51 -07:00
Stuart Scott
176f512c5a Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
 2015-05-22 10:19:53 -07:00
Jim Miller
cd2eb2e6c3 am e52c0152: am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit 'e52c0152f8a8982fe02ffd3d7e2f2f9969167721':
  Fix crash in fingerprint settings.
 2015-05-22 15:50:04 +00:00
Jim Miller
e52c0152f8 am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit '549d5ec89ecc35a7d91fbd10f982788c135f520d':
  Fix crash in fingerprint settings.
 2015-05-22 02:03:21 +00:00
Jim Miller
549d5ec89e am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev 
* commit 'c499a5fe9d6632fa73104dcc88a9e2c2cd390dde':
  Fix crash in fingerprint settings.
 2015-05-22 01:50:13 +00:00