PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,822 Commits 1 Branch 0 Tags
7077e6460e393e567d3b80da6190ff1ebe7d834a
Commit Graph

11822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
The Android Automerger
49306d6e1d merge in klp-release history after reset to klp-dev 2013-10-06 06:02:07 -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
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
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
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
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
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
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
Vinit Deshapnde
2337e472d6 am db750e8f: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit 'db750e8f2cd20aa09875dfd54656df11e27151bf':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-04 12:02:19 -07:00
Vinit Deshapnde
db750e8f2c Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 2013-10-04 18:20:42 +00:00
Amith Yamasani
38e7610512 Exit restrictions fragment if user was deleted 
When resuming the restricted user fragment, make sure that the user still
exists, as it may have been deleted by the restricted user.

Bug: 11010340

Change-Id: I3360dbc42586c5bb28013844f8c788e641ad8b6a
 2013-10-03 16:08:56 -07:00
Baligh Uddin
155fc0ff6b am b3334e77: (-s ours) am 2274bb53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b3334e77a25cb3a62bb6b9554bf120fc82c80f8d':
  Import translations. DO NOT MERGE
 2013-10-03 15:40:38 -07:00
Baligh Uddin
b3334e77a2 am 2274bb53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2274bb53cf9aa2e131ebbd9d0517d57436c31c36':
  Import translations. DO NOT MERGE
 2013-10-03 12:19:12 -07:00
The Android Automerger
fdb1da00cb merge in klp-release history after reset to klp-dev 2013-10-03 06:02:53 -07:00
Baligh Uddin
2274bb53cf Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-03 03:58:40 +00:00
Svetoslav
e60a06b0e7 am 672b845e: Merge "Polish print settings accessibility." into klp-dev 
* commit '672b845eec350cc03402f5961f56ac47a5dac220':
  Polish print settings accessibility.
 2013-10-02 16:55:27 -07:00
Baligh Uddin
1cc4766d3b Import translations. DO NOT MERGE 
Change-Id: Ice51de6939fa0e1c759ad7b76f3bc2392d64f57e
Auto-generated-cl: translation import
 2013-10-02 16:51:24 -07:00
Svetoslav
672b845eec Merge "Polish print settings accessibility." into klp-dev 2013-10-02 23:48:07 +00:00
Svetoslav
24e49f0613 Polish print settings accessibility. 
bug:10983508

Change-Id: I986e28a2cd8e52b7c8422e825de9174d6e2377c3
 2013-10-02 15:16:16 -07:00
Christopher Tate
73f5f2aac9 am e7358028: Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev 
* commit 'e7358028d10f87d0499e3d85abf699824882b9e2':
  Back out of Home settings when penultimate home app is uninstalled
 2013-10-02 15:16:02 -07:00
Christopher Tate
e7358028d1 Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev 2013-10-02 22:11:50 +00:00
Lifu Tang
a310b6382d am 3846b539: Merge "Modified suggestion string for battery-saving mode" into klp-dev 
* commit '3846b5393820c96b96e0e0922f71514aaa8a2eee':
  Modified suggestion string for battery-saving mode
 2013-10-02 15:09:36 -07:00
Lifu Tang
3846b53938 Merge "Modified suggestion string for battery-saving mode" into klp-dev 2013-10-02 22:03:39 +00:00
Amith Yamasani
548f31715b Load account type icons in a background thread before scrolling down 
This reduces the jank when scrolling down in top-level Settings if you
happen to have several account types like Google, Twitter, Facebook, etc.

In the process of doing this, discovered that headers get built even when
they're not showing (SubSettings). Skip setting up the headers, which can
be expensive when there are several accounts.

Bug: 11006601
Change-Id: I8b4eafdcc2fc2beecac01317c3c8f07a82febcc0
 2013-10-02 14:44:45 -07:00
Amith Yamasani
3f60d8d395 am d462e868: Merge "Load account type icons in a background thread before scrolling down" into klp-dev 
* commit 'd462e8686697094161930c76a648f75e8c6afd92':
  Load account type icons in a background thread before scrolling down
 2013-10-02 14:29:39 -07:00
David Braun
fdbb26c8af am 6e5956eb: Merge "Default SMS app setting should still be shown even if SIM is removed." into klp-dev 
* commit '6e5956ebe2b9c3d06ea463bba5c864dad58e0c02':
  Default SMS app setting should still be shown even if SIM is removed.
 2013-10-02 14:29:39 -07:00
Lifu Tang
b581a08f9f Modified suggestion string for battery-saving mode 
- Fix b/11009797

Change-Id: I55a890348ec2d3ec79956306b65e58449d88dbd3
 2013-10-02 13:56:06 -07:00
Christopher Tate
e0d934fcb1 Back out of Home settings when penultimate home app is uninstalled 
When the user deletes the last-but-one, there's nothing more that
they can do in Home settings (and we'll be suppressing it from the
top level of the Settings UI as well), so we now back out with
a dialog explaining the situation.

Bug 10918801

Change-Id: Id03169dace976f7de639e3b3ab3d50ed161258d8
 2013-10-02 13:26:36 -07:00