Commit Graph

10657 Commits

Author SHA1 Message Date
Amith Yamasani
010ab3bd92 am e5fc4071: Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev
* commit 'e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d':
  Return proper result code after creating pin/password lock
2013-05-15 17:12:02 -07:00
Amith Yamasani
e5fc407146 Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev 2013-05-16 00:01:42 +00:00
Amith Yamasani
8d26ba45e3 Return proper result code after creating pin/password lock
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.

Bug: 8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
2013-05-15 11:26:19 -07:00
John Spurlock
55dbdf68f9 Hide notification listeners setting if no listeners.
Hide the new notification listeners management setting when
no listeners using this API are available.

Bug: 8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
2013-05-15 10:13:34 -04:00
The Android Automerger
8ef742c228 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-15 05:55:42 -07:00
Amith Yamasani
7545cff217 am 813d2383: am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '813d23838b76623faa6b2ceb4ad7458cba0f726f':
  Add a settings icon to restricted profile config header
2013-05-14 14:58:12 -07:00
Amith Yamasani
813d23838b am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '00dc15d9dab780e9a61d1b3a20446d6519b5b076':
  Add a settings icon to restricted profile config header
2013-05-14 14:56:13 -07:00
Amith Yamasani
00dc15d9da Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev 2013-05-14 21:54:28 +00:00
The Android Automerger
20010a7286 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-14 05:55:44 -07:00
Amith Yamasani
7f7a07d365 Merge "Use circular avatars wherever appropriate" 2013-05-13 23:07:00 +00:00
Amith Yamasani
b0b0b110c0 Use circular avatars wherever appropriate
Battery stats, Data usage and Running apps

Change-Id: Ib7f851e55ef7e44f18d3f8a2cd27f5f2204b0145
2013-05-13 16:01:20 -07:00
Amith Yamasani
1d4329631d Add a settings icon to restricted profile config header
This is to make it obvious that the header invokes user info settings.

Bug: 8888002

Also fix a minor copy/paste error in contentDesription attribute.

Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
2013-05-13 14:58:56 -07:00
Robert Greenwalt
39da2f9129 am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit 'b2dccc418410cd2c35213fddb5da7dce1d91c47b':
  Remove wifi scan-always dialog.
2013-05-13 14:15:41 -07:00
Robert Greenwalt
b2dccc4184 am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit 'd5d61a0ab18c57cf2087d17f10d4d4569d968078':
  Remove wifi scan-always dialog.
2013-05-13 14:13:48 -07:00
Robert Greenwalt
d5d61a0ab1 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:20 +00:00
Robert Greenwalt
7e59f73e9c Remove wifi scan-always dialog.
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.

bug:8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
2013-05-13 11:39:08 -07:00
Baligh Uddin
a0f474de45 am 9df440f7: (-s ours) am 0a3cf293: Import translations. DO NOT MERGE
* commit '9df440f7edf65b8d7d5be8f307d74cafd672d4b4':
  Import translations. DO NOT MERGE
2013-05-13 09:52:58 -07:00
Baligh Uddin
9df440f7ed am 0a3cf293: Import translations. DO NOT MERGE
* commit '0a3cf29344bcfd7071975c9f266574454209aa95':
  Import translations. DO NOT MERGE
2013-05-13 09:50:06 -07:00
Baligh Uddin
0309f336cc Import translations. DO NOT MERGE
Change-Id: I55826bb6824378babffe07b0a9353a42eb456818
Auto-generated-cl: translation import
2013-05-13 09:46:14 -07:00
Baligh Uddin
0a3cf29344 Import translations. DO NOT MERGE
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
2013-05-13 09:42:52 -07:00
Satoshi Kataoka
a8c37bcae3 Tweak a label in the personal dictionary settings
Bug: 8897600
Change-Id: I170ee12c06f5d03af355e279d8ac738f68feaad0
2013-05-10 12:13:49 +09:00
The Android Automerger
527900a63a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-09 05:55:41 -07:00
Svetoslav
17c2e0e605 am 6b8c7e7c: am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
  Settings crashing if there are no installed accessibility services.
2013-05-08 15:05:28 -07:00
Baligh Uddin
3c573d3af5 am eb8e9c11: (-s ours) am 2c766ba5: Import translations. DO NOT MERGE
* commit 'eb8e9c11ede066a7b28c51b3492ce7253304cb5b':
  Import translations. DO NOT MERGE
2013-05-08 15:04:41 -07:00
Svetoslav
6b8c7e7c33 am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev
* commit '7e554395cbf3d3c1043e99fb080bd9148832c225':
  Settings crashing if there are no installed accessibility services.
2013-05-08 14:37:00 -07:00
Svetoslav
7e554395cb Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev 2013-05-08 21:33:14 +00:00
Svetoslav
084fbc8107 Settings crashing if there are no installed accessibility services.
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...

bug:8871034

Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
2013-05-08 12:14:18 -07:00
Baligh Uddin
eb8e9c11ed am 2c766ba5: Import translations. DO NOT MERGE
* commit '2c766ba56c740ec09f071144014272f4d922d518':
  Import translations. DO NOT MERGE
2013-05-08 11:28:49 -07:00
Baligh Uddin
b590a5d9dc Import translations. DO NOT MERGE
Change-Id: I5681e12c45cbea55910772e7761dc122bc55ff71
Auto-generated-cl: translation import
2013-05-08 11:07:07 -07:00
Baligh Uddin
2c766ba56c Import translations. DO NOT MERGE
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
2013-05-08 11:03:17 -07:00
Satoshi Kataoka
2cb9f8a62a Merge "Fix the label for the personal dictionary settings" 2013-05-08 09:54:25 +00:00
Satoshi Kataoka
5e86985b3a Fix the label for the personal dictionary settings
Bug: 8859441
Change-Id: I18ae1e1d92e1280e1782685b99307f1e48ce8e66
2013-05-08 16:15:45 +09:00
The Android Automerger
1ea87b0313 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-07 05:55:42 -07:00
Dianne Hackborn
7a03d980f7 Merge "Update UI to add new audio app ops." 2013-05-06 23:33:20 +00:00
Baligh Uddin
b72ffa2479 am 7f4c7641: (-s ours) am c6adece0: Import translations. DO NOT MERGE
* commit '7f4c7641e0ce85162eb8f5c8846e35db29a068f7':
  Import translations. DO NOT MERGE
2013-05-06 16:20:44 -07:00
Dianne Hackborn
6e91babeda Update UI to add new audio app ops.
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
2013-05-06 16:13:34 -07:00
Baligh Uddin
68a958619d am c8e75eaa: (-s ours) am 6681e954: Import translations. DO NOT MERGE
* commit 'c8e75eaaab0f7aa4177f151b2d31de26c3e4c32a':
  Import translations. DO NOT MERGE
2013-05-06 13:56:04 -07:00
Baligh Uddin
7f4c7641e0 am c6adece0: Import translations. DO NOT MERGE
* commit 'c6adece066c2bc282db92547913a8aa43831c5f0':
  Import translations. DO NOT MERGE
2013-05-06 12:31:30 -07:00
Baligh Uddin
3d7f617cbd Import translations. DO NOT MERGE
Change-Id: Id8e754017aac82b1b423b8f3b02f4191d71a58dd
Auto-generated-cl: translation import
2013-05-06 12:02:35 -07:00
Baligh Uddin
c6adece066 Import translations. DO NOT MERGE
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
2013-05-06 11:59:20 -07:00
Baligh Uddin
c8e75eaaab am 6681e954: Import translations. DO NOT MERGE
* commit '6681e954a8d05d818b9bd89a1302ac2d8875ab77':
  Import translations. DO NOT MERGE
2013-05-06 11:11:29 -07:00
The Android Automerger
d6377770ba merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-06 05:55:52 -07:00
Baligh Uddin
1d9e5d8e71 Merge "Import translations. DO NOT MERGE" 2013-05-04 23:11:09 +00:00
Romain Guy
eb90fc56b2 Add new GPU overdraw setting
Change-Id: I45404b37df382e51eea42de92535f49f870c98b2
2013-05-03 17:38:38 -07:00
Baligh Uddin
bd20e4766d Import translations. DO NOT MERGE
Change-Id: I706e8606b77d5ec1076c4954911da5aefb6b1805
Auto-generated-cl: translation import
2013-05-03 13:16:25 -07:00
Baligh Uddin
6681e954a8 Import translations. DO NOT MERGE
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
2013-05-03 13:12:52 -07:00
The Android Automerger
e624f14e9d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-02 05:55:40 -07:00
Baligh Uddin
738ea06045 am e9160a24: (-s ours) am 6c886cd3: Import translations. DO NOT MERGE
* commit 'e9160a243154b338653e43e3e415caa84c2790ae':
  Import translations. DO NOT MERGE
2013-05-01 13:50:56 -07:00
Baligh Uddin
e9160a2431 am 6c886cd3: Import translations. DO NOT MERGE
* commit '6c886cd394e0960a1ed41a785e05b38a57ee8209':
  Import translations. DO NOT MERGE
2013-05-01 13:48:35 -07:00
Baligh Uddin
cbc7319992 Import translations. DO NOT MERGE
Change-Id: I124056964f65373288bf0ba1c530b6764b4c0abf
Auto-generated-cl: translation import
2013-05-01 10:47:18 -07:00