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

12484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6b590746df am 1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1955bf1bb3147a06d1856ac002f8cd5aab4f535e':
  Import translations. DO NOT MERGE
 2013-10-07 20:51:30 -07:00
Baligh Uddin
0e124560e6 am ebaa7509: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ebaa7509edda445e1d809b331d9ecc848fe19773':
  Import translations. DO NOT MERGE
 2013-10-07 20:51:06 -07:00
Baligh Uddin
ab0f5ae4e3 Merge "Import translations. DO NOT MERGE" 2013-10-08 03:49:39 +00:00
Baligh Uddin
ebaa7509ed Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-08 03:49:34 +00:00
Baligh Uddin
1955bf1bb3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 03:49:14 +00:00
Baligh Uddin
5faedbfb72 Import translations. DO NOT MERGE 
Change-Id: Ia0bfc7802cee3463b0ea003fa23a41ac948065cf
Auto-generated-cl: translation import
 2013-10-07 19:06:16 -07:00
Baligh Uddin
b49c9a49d5 Import translations. DO NOT MERGE 
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
 2013-10-07 19:02:02 -07:00
Baligh Uddin
275f7679d0 Import translations. DO NOT MERGE 
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
 2013-10-07 18:55:29 -07:00
Chris Wren
cff5cca476 am 65994536: am 98b30cea: am a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev 
* commit '659945365d83bd30de5a506e9504687217393db8':
  Hide Camera in CryptKeeperConfirm
 2013-10-07 13:12:23 -07:00
Chris Wren
659945365d am 98b30cea: am a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev 
* commit '98b30ceaa2ef049f41907ea9672bb5f028472f1c':
  Hide Camera in CryptKeeperConfirm
 2013-10-07 13:09:39 -07:00
Chris Wren
98b30ceaa2 am a50f7851: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev 
* commit 'a50f78515e2718fa5e47f283e25705806bd163aa':
  Hide Camera in CryptKeeperConfirm
 2013-10-07 13:06:45 -07:00
Chris Wren
a50f78515e Merge "Hide Camera in CryptKeeperConfirm" into klp-dev 2013-10-07 20:01:35 +00:00
David Braun
af1bf89528 am 1c2a3ad6: am a633e1d5: am 1c17255d: Block "SMS Default Dialog" on non-phone devices 
* commit '1c2a3ad6cb262447ebed557c6b1bf36bab11d59e':
  Block "SMS Default Dialog" on non-phone devices
 2013-10-07 11:18:09 -07:00
David Braun
1c2a3ad6cb am a633e1d5: am 1c17255d: Block "SMS Default Dialog" on non-phone devices 
* commit 'a633e1d54d28d5c646b1f99df62a9250e48340ce':
  Block "SMS Default Dialog" on non-phone devices
 2013-10-07 11:15:39 -07:00
David Braun
a633e1d54d am 1c17255d: Block "SMS Default Dialog" on non-phone devices 
* commit '1c17255d5edadaf1790af365d2ed5f962a7bcc65':
  Block "SMS Default Dialog" on non-phone devices
 2013-10-07 11:13:22 -07:00
David Braun
1c17255d5e Block "SMS Default Dialog" on non-phone devices 
This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)

Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1
 2013-10-07 09:35:52 -07:00
Chris Wren
0481dc7172 Hide Camera in CryptKeeperConfirm 
Bug: 10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77
 2013-10-07 01:11:08 -04:00
Robert Greenwalt
21a2eb5aea Add batch scan data to power stats. 
bug:10690989
Change-Id: I5c21b8234eb1dec2da01032a87e2129b5b5cb225
 2013-10-06 13:35:23 -07:00
The Android Automerger
49306d6e1d merge in klp-release history after reset to klp-dev 2013-10-06 06:02:07 -07:00
Baligh Uddin
ee63519d2a am 2abb3443: (-s ours) am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2abb3443170885bc41ccfaa903796f6435b10839':
  Import translations. DO NOT MERGE
 2013-10-05 09:40:53 -07:00
Baligh Uddin
2abb344317 am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '040cfe56112326d470a58b2f55642a234ff3fce2':
  Import translations. DO NOT MERGE
 2013-10-05 09:37:01 -07:00
Baligh Uddin
493324ebae am 5318a0d3: (-s ours) am 249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '5318a0d3059c65f51464c7110e34d4f5a33de7be':
  Import translations. DO NOT MERGE
 2013-10-04 20:42:22 -07:00
Baligh Uddin
040cfe5611 am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8aecb7cea083366fc85d8088d7e5e18e775fee80':
  Import translations. DO NOT MERGE
 2013-10-04 20:41:16 -07:00
Baligh Uddin
5318a0d305 am 249100c1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '249100c1151569a9e903489b2f496446f740cc29':
  Import translations. DO NOT MERGE
 2013-10-04 20:40:32 -07:00
Baligh Uddin
03da98f21f Merge "Import translations. DO NOT MERGE" 2013-10-05 03:38:22 +00:00
Baligh Uddin
249100c115 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-05 03:38:17 +00:00
Baligh Uddin
8aecb7cea0 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-05 03:37:55 +00:00
Baligh Uddin
39529d4672 Import translations. DO NOT MERGE 
Change-Id: I6b8001b3f2fcb88b547b79b020472fa62d2e70c9
Auto-generated-cl: translation import
 2013-10-04 18:48:30 -07:00
Baligh Uddin
f604cd9842 Import translations. DO NOT MERGE 
Change-Id: I6da7d93122a4b4b00a05fbabb5170b935610dfc2
Auto-generated-cl: translation import
 2013-10-04 18:44:36 -07:00
Baligh Uddin
f2b4a7dd37 Import translations. DO NOT MERGE 
Change-Id: I97e1bf2ace031bcf591507987bd5d6ae9c6160fd
Auto-generated-cl: translation import
 2013-10-04 18:40:44 -07:00
Svetoslav
4b23800471 am ef1cfe16: am 32d7ea74: am 9379d935: Make printers for a print service not react to press. 
* commit 'ef1cfe16fb95a8ae0e73dbd8d2f4235386be1803':
  Make printers for a print service not react to press.
 2013-10-04 18:08:26 -07:00
Svetoslav
ef1cfe16fb am 32d7ea74: am 9379d935: Make printers for a print service not react to press. 
* commit '32d7ea74074875b43df22369e915c177e67a0316':
  Make printers for a print service not react to press.
 2013-10-04 18:05:11 -07:00
Svetoslav
32d7ea7407 am 9379d935: Make printers for a print service not react to press. 
* commit '9379d935552118e33ccee5aa8383d8f86bdff113':
  Make printers for a print service not react to press.
 2013-10-04 18:02:19 -07:00
Svetoslav
9379d93555 Make printers for a print service not react to press. 
We show a list of printers for the a print service in the
print service settings activity. This list is there to
inform the user of which printers are available and
optionally offers adding a printer affordance. The printer
list items do nothing so they should not react to press
and create a false impression they do.

bug:10983508

Change-Id: I43b19ebb0acf6662c489826c192fd6daf8ad103d
 2013-10-04 17:52:39 -07:00
Amith Yamasani
ecb9156898 am 8f4919ff: am b46e57ee: am 4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev 
* commit '8f4919ffeb97994c5214011696945d08ca8beedb':
  Use a public media content uri for viewing local media files
 2013-10-04 17:36:46 -07:00
Ari Sachter-Zeltzer
9e22dac053 am 0cccd8b3: am 916a50db: am 0a9d037b: updated launcher settings icon to gray gear 
* commit '0cccd8b3b887023c1400203ca8f9a743931cfaa4':
  updated launcher settings icon to gray gear
 2013-10-04 17:36:38 -07:00
Ari Sachter-Zeltzer
30143ce3e7 updated launcher settings icon to gray gear 
fixes b/10788190

Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa
 2013-10-04 16:19:41 -07:00
Amith Yamasani
8f4919ffeb am b46e57ee: am 4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev 
* commit 'b46e57ee261578ffb45c0b679b56b26f6dfe1208':
  Use a public media content uri for viewing local media files
 2013-10-04 16:03:05 -07:00
Amith Yamasani
b46e57ee26 am 4a4a1b8b: Merge "Use a public media content uri for viewing local media files" into klp-dev 
* commit '4a4a1b8b96dd01aacfd82f189d5222baf9eafba9':
  Use a public media content uri for viewing local media files
 2013-10-04 16:00:44 -07:00
Amith Yamasani
4a4a1b8b96 Merge "Use a public media content uri for viewing local media files" into klp-dev 2013-10-04 22:58:05 +00:00
Ari Sachter-Zeltzer
0cccd8b3b8 am 916a50db: am 0a9d037b: updated launcher settings icon to gray gear 
* commit '916a50dbabd4a1c775e92518eaf43bd555ceef00':
  updated launcher settings icon to gray gear
 2013-10-04 15:55:39 -07:00
Ari Sachter-Zeltzer
916a50dbab am 0a9d037b: updated launcher settings icon to gray gear 
* commit '0a9d037bed992adda30da67e95b8cad1904f954c':
  updated launcher settings icon to gray gear
 2013-10-04 15:53:50 -07:00
Amith Yamasani
c778bc560d Use a public media content uri for viewing local media files 
Bug: 11061566
Change-Id: I7e049f48d37a68a0a41b7a62383eea71f3938c44
 2013-10-04 14:59:40 -07:00
Ari Sachter-Zeltzer
0a9d037bed updated launcher settings icon to gray gear 
fixes b/10788190

Change-Id: I11f21d7614fe70781ae2d20ab2947c77843580fa
 2013-10-04 21:48:02 +00:00
Amith Yamasani
2d4a3087ec am 328acd44: am 658e6807: am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev 
* commit '328acd4491eda2a8dd19cc7d7fe3dd74064b392d':
  Exit restrictions fragment if user was deleted
 2013-10-04 13:40:32 -07:00
Vinit Deshapnde
5fe2760447 am a4a679ae: am 2337e472: am db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit 'a4a679ae70a364dd4063f23abb624c6fc9aeb30f':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-04 13:40:32 -07:00
Amith Yamasani
328acd4491 am 658e6807: am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev 
* commit '658e6807aebb451721c413c0becd1ac0fd3bbfcc':
  Exit restrictions fragment if user was deleted
 2013-10-04 13:34:44 -07:00
Vinit Deshapnde
a4a679ae70 am 2337e472: am db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit '2337e472d6bfd4cb8812a9cdfb5fa66b728b1693':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-04 13:34:01 -07:00
Amith Yamasani
658e6807ae am 16d358da: Merge "Exit restrictions fragment if user was deleted" into klp-dev 
* commit '16d358daf00b54c2ecfe5f5b8de8de5a8cfa14ef':
  Exit restrictions fragment if user was deleted
 2013-10-04 12:56:37 -07:00
Amith Yamasani
16d358daf0 Merge "Exit restrictions fragment if user was deleted" into klp-dev 2013-10-04 19:55:18 +00:00