PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,473 Commits 1 Branch 0 Tags
5a14ab8930f7692773f18e7138ba930cd6f53a8c
Commit Graph

12473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2f888a4752 am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE 
* commit '9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
  Import translations. DO NOT MERGE
 2013-11-13 18:33:06 -08:00
Baligh Uddin
3f4a8e47e1 Merge "Import translations. DO NOT MERGE" 2013-11-14 02:24:51 +00:00
Baligh Uddin
69f6b8a4c6 Import translations. DO NOT MERGE 
Change-Id: Idcb80c7ffa297e2175e8d309aaa9e8845eeb0e12
Auto-generated-cl: translation import
 2013-11-13 18:14:33 -08:00
Baligh Uddin
9b28d5a0c3 Import translations. DO NOT MERGE 
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
 2013-11-13 18:06:51 -08:00
Jeff Brown
57cf0e6671 am bf2f9612: am 3aedfdfd: am 81ed0438: Finalize assets for screen cast. 
* commit 'bf2f96123fde3d1433ac18a072832b5f0f6a604f':
  Finalize assets for screen cast.
 2013-11-13 09:05:55 -08:00
Jeff Brown
bf2f96123f am 3aedfdfd: am 81ed0438: Finalize assets for screen cast. 
* commit '3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
  Finalize assets for screen cast.
 2013-11-13 09:02:20 -08:00
Jeff Brown
3aedfdfdbf am 81ed0438: Finalize assets for screen cast. 
* commit '81ed043857dadcb69885c1e2ac37d63925c56c65':
  Finalize assets for screen cast.
 2013-11-13 08:57:58 -08:00
Jeff Brown
81ed043857 Finalize assets for screen cast. 
Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
 2013-11-13 00:43:30 -08:00
Wei Wang
5cc44ae3d0 Add ble settings strings. 
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
 2013-11-12 17:29:32 -08:00
Baligh Uddin
9f4da28899 am 5a04fb76: (-s ours) am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5a04fb76dacbc6b0e030f726f4a03642a108b4dd':
  Import translations. DO NOT MERGE
 2013-11-11 20:51:28 -08:00
Jeff Brown
71504b1f71 am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 20:51:05 -08:00
Baligh Uddin
5a04fb76da am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '74a503fddf2626f6aedec486e9b30c4beb6377e2':
  Import translations. DO NOT MERGE
 2013-11-11 14:48:31 -08:00
Baligh Uddin
74a503fddf am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
  Import translations. DO NOT MERGE
 2013-11-11 14:44:42 -08:00
Baligh Uddin
622b5d2a6a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:41:12 +00:00
Baligh Uddin
4366e49651 Import translations. DO NOT MERGE 
Change-Id: I4d3ae2840e2024de8eb5a15fbdab5f68123cb1c7
Auto-generated-cl: translation import
 2013-11-11 10:40:56 -08:00
Baligh Uddin
b50dc884a2 Import translations. DO NOT MERGE 
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
 2013-11-11 10:35:06 -08:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 10:27:24 -08:00
Jeff Brown
2fba8be9c0 am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 10:21:59 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI. 
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
 2013-11-10 21:20:16 -08:00
Ed Heyl
2bfdd36521 am f841589f: am 7ebe4c6c: am a27816dc: merge in release branch changes (no-op). 
* commit 'f841589f6a9b989e18716fac157d16b0d95f70a9':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-08 14:02:40 -08:00
Ed Heyl
f841589f6a am 7ebe4c6c: am a27816dc: merge in release branch changes (no-op). 
* commit '7ebe4c6c209e983e648e2529d68ebe2c36bf7733':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-08 13:59:55 -08:00
Ed Heyl
7ebe4c6c20 am a27816dc: merge in release branch changes (no-op). 
* commit 'a27816dc2d72f5757ee5377ccd03798736c96fd8':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-08 13:31:32 -08:00
Ed Heyl
a27816dc2d merge in release branch changes (no-op). 2013-11-08 13:23:52 -08:00
Robert Greenwalt
3bdc1eb38a am 6c20565d: am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev 
* commit '6c20565d97339751f22123a4b40893f2df7ea3ad':
  Add batch scan data to power stats.
 2013-11-07 15:12:58 -08:00
David Christie
587e6bf3fc Update power widget icons and fix location behavior 
Bug: 11242129

Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
 2013-11-07 11:20:35 -08:00
Robert Greenwalt
6c20565d97 am 384bf727: am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev 
* commit '384bf72708b623bf48a0395a51db94bda055f496':
  Add batch scan data to power stats.
 2013-11-07 10:43:11 -08:00
Robert Greenwalt
384bf72708 am 29b7a844: Merge "Add batch scan data to power stats." into klp-dev 
* commit '29b7a8446a36286bd4311ec2f52281fd1628a86e':
  Add batch scan data to power stats.
 2013-11-07 10:32:55 -08:00
Robert Greenwalt
29b7a8446a Merge "Add batch scan data to power stats." into klp-dev 2013-11-07 18:31:03 +00:00
The Android Automerger
84760b633b merge in klp-mr1-release history after reset to klp-dev 2013-11-07 06:01:28 -08:00
Baligh Uddin
91858723ae am 233692b0: (-s ours) am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '233692b051050faf37931ac8013839de7785f0f2':
  Import translations. DO NOT MERGE
 2013-11-06 20:09:47 -08:00
Baligh Uddin
233692b051 am f9be657a: (-s ours) am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f9be657ac28f2530938c24b09458defdbca07c4c':
  Import translations. DO NOT MERGE
 2013-11-06 20:06:01 -08:00
Baligh Uddin
f9be657ac2 am 7d716436: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7d7164361e3e9cf9198fca4050fca81547053b04':
  Import translations. DO NOT MERGE
 2013-11-06 20:03:44 -08:00
Baligh Uddin
930f873016 Merge "Import translations. DO NOT MERGE" 2013-11-07 04:00:08 +00:00
Baligh Uddin
7d7164361e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 04:00:05 +00:00
Kenny Root
856c998aab am d0e1c273: am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 
* commit 'd0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-06 15:17:49 -08:00
Kenny Root
d0e1c273db am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 
* commit '279c1e15d23254728783ad99faff7349d9543ac4':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-06 15:14:35 -08:00
Kenny Root
8be30bb162 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 15:14:16 -08:00
Kenny Root
279c1e15d2 am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 
* commit 'd0de39e716c7d93beeb83f9b442af437be651e55':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-06 15:11:14 -08:00
Kenny Root
d0de39e716 Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 2013-11-06 23:09:06 +00:00
Baligh Uddin
be4399b2f7 Import translations. DO NOT MERGE 
Change-Id: I802dcdf95e177ce98ade2553310f26fa04c843d3
Auto-generated-cl: translation import
 2013-11-06 14:39:01 -08:00
Baligh Uddin
4a5e53aa02 Import translations. DO NOT MERGE 
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
 2013-11-06 14:34:35 -08:00
Kenny Root
b974fa8034 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 22:03:52 +00:00
Lifu Tang
9ec08d65c5 am 227043b5: am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev 
* commit '227043b55722b38cde8508011e2b1748e5ef66bc':
  Shows LGAAYL when launching Location Settings
 2013-11-06 08:51:56 -08:00
Lifu Tang
227043b557 am 5b68e4c8: am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev 
* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
  Shows LGAAYL when launching Location Settings
 2013-11-05 22:26:19 -08:00
Lifu Tang
5b68e4c8d0 am 741bc054: Merge "Shows LGAAYL when launching Location Settings" into klp-dev 
* commit '741bc054243576dcfff17bf3a807dc8732bca332':
  Shows LGAAYL when launching Location Settings
 2013-11-05 22:23:01 -08:00
Lifu Tang
741bc05424 Merge "Shows LGAAYL when launching Location Settings" into klp-dev 2013-11-06 06:20:56 +00:00
Geoffrey Borggaard
f2f1ad9cdd am 12a2c408: am 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev 
* commit '12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a':
  Remove line break.
 2013-11-05 18:59:12 -08:00
Jason Monk
492c8ef15e am 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 
* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
  Add PAC UI to Wi-Fi Settings
 2013-11-05 18:59:11 -08:00
Geoffrey Borggaard
12a2c40871 am 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev 
* commit '36ddea8c212b21dc24e270ce7d20023db1477a32':
  Remove line break.
 2013-11-05 18:56:59 -08:00
Jason Monk
58f53f9c35 am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 
* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
  Add PAC UI to Wi-Fi Settings
 2013-11-05 18:56:49 -08:00