Vineeta Srivastava
4888cdf9f6
am 7fd1014f: am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
...
* commit '7fd1014f093258d820e15dc9814e5aaad579bafb':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
2015-08-24 19:17:03 +00:00
Steve McKay
38b4c6f436
Use resource aliases in-lieu of ViewStubs.
...
This eliminates the double resource inflation necsesitated by the use of ViewStubs.
Change-Id: I9749356bed24f48b8304897dc6d8dc47cc11736c
2015-08-24 12:11:28 -07:00
Vineeta Srivastava
7fd1014f09
am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
...
* commit '21490522523c24c2873d4b3b89caa7d243982490':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
2015-08-24 19:07:36 +00:00
Vineeta Srivastava
2149052252
Merge "Don't show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
2015-08-24 19:00:27 +00:00
Xiaohui Chen
2a5c3e59c8
pm: translate incoming user id for installation
...
Currently the pm install commands will not take virtual user id like
-2. Adding this feature will make it easier to install packages in a
multi-user environment.
Bug: 19913735
Change-Id: I68b13cf8f2290158f0f4ec5c0966853719c2e80f
2015-08-24 11:00:14 -07:00
Scott Main
e9fdf708fa
am f6321a44: am 595e565c: am 1c5e92b1: am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.co
...
* commit 'f6321a4493c801ca779b9f0da2bd2866eb4a292b':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
2015-08-24 17:13:04 +00:00
Eric Laurent
61483d885a
Merge "AudioTrack: error reporting for getTimestamp()"
2015-08-24 17:06:32 +00:00
Scott Main
f6321a4493
am 595e565c: am 1c5e92b1: am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
...
* commit '595e565c467540cdd77d07e37bb3f73f7272e87f':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
2015-08-24 17:06:26 +00:00
Geoff Mendal
4e80d7fc0b
am 5b204206: (-s ours) am cca7c4f9: (-s ours) am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE
...
* commit '5b20420652fe8ed921769cbb3b5e7361fa5387b8':
Import translations. DO NOT MERGE
2015-08-24 17:03:15 +00:00
Geoff Mendal
5b20420652
am cca7c4f9: (-s ours) am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cca7c4f945f4bf1bc2e8d0116d2248898abb2472':
Import translations. DO NOT MERGE
2015-08-24 16:55:05 +00:00
Scott Main
595e565c46
am 1c5e92b1: am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/ " into mnc-de
...
* commit '1c5e92b125328fdfdd64de78b83ad2c65d9bf5f7':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
2015-08-24 16:54:59 +00:00
Scott Main
1c5e92b125
am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/ " into mnc-dev
...
* commit '8b86268be3fd713394915cbed3d71cc85f806fe1':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
2015-08-24 16:49:00 +00:00
Xiaohui Chen
bd0e03bb76
More USER_OWNER cleanup.
...
Bug: 19913735
Change-Id: I408a92d9dbab2a096407efccb91e2a8bdc22714d
2015-08-24 16:42:37 +00:00
Xiaohui Chen
72d9c02656
Update UserManagerTest
...
This makes it work in split system user mode.
Bug: 19913735
Change-Id: Ia1bd7043aba9fb34333e0edcc7375d287570c80a
2015-08-24 16:41:39 +00:00
Scott Main
8b86268be3
am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/ " into mnc-dev
...
* commit 'c04d21fc4ec66d34ca5395db59fadc5e4626bb1c':
add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/
2015-08-24 16:41:22 +00:00
Geoff Mendal
cca7c4f945
am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE
...
* commit '92f43c8eb74722ecedcbda5b2af5daa581f2dd29':
Import translations. DO NOT MERGE
2015-08-24 16:37:31 +00:00
Scott Main
c04d21fc4e
Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/ " into mnc-dev
2015-08-24 16:34:35 +00:00
Geoff Mendal
92f43c8eb7
am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE
...
* commit '4e3af2ec5a480754e5d0793ce21b68cb3a9b32d8':
Import translations. DO NOT MERGE
2015-08-24 16:29:56 +00:00
Geoff Mendal
e4f04a1a72
Merge "Import translations. DO NOT MERGE"
2015-08-24 16:22:48 +00:00
Steve McKay
8fa5e0c80a
Merge "Show a drawer when in portrait mode."
2015-08-24 16:07:18 +00:00
Steve McKay
12055474a7
Show a drawer when in portrait mode.
...
This makes more space available for content.
Rename all the "Standalone" stuff to just "Files".
Move layout inflation into base class.
Move backbutton > drawer interaction into BaseActivity.
Change-Id: Ie778b323c6e80122389f029be148dd9e0c4bfb6e
2015-08-24 09:05:51 -07:00
Geoff Mendal
4e3af2ec5a
Import translations. DO NOT MERGE
...
Change-Id: I62399fd97cd9a757f8e6b8ec6c7f0b21154c1a43
Auto-generated-cl: translation import
2015-08-24 11:04:11 -05:00
Geoff Mendal
a331b46611
Import translations. DO NOT MERGE
...
Change-Id: I8b75341c935f341801aca1c01182bd99672eb7db
Auto-generated-cl: translation import
2015-08-24 10:57:02 -05:00
Filip Gruszczynski
db0fa33f44
Merge "Using initial activity layout to position the launching activity."
2015-08-24 14:39:03 +00:00
Filip Gruszczynski
9b1ce52f25
Using initial activity layout to position the launching activity.
...
The activity can be positioned in the center or in one of the corners.
From there it shifts its position and tries to find a spot where it
doesn't collide with other activities.
The CL also includes a few fixes necessary to pipe the information about
the initial layout through the system.
Change-Id: I2aaf5b6d20044aafec713b7bd4193b05cfbd16f3
2015-08-24 07:35:38 -07:00
Geoff Mendal
9869ed1165
Import translations. DO NOT MERGE
...
Change-Id: I79c71a7dbe26f375bd53f947be1e9e00a077c566
Auto-generated-cl: translation import
2015-08-24 05:57:55 -07:00
Yasuhiro Matsuda
f6bc30c739
Merge "Do not broadcast VOLUME_STATE_CHANGED before boot has completed."
2015-08-24 05:30:43 +00:00
Yasuhiro Matsuda
87a38b5991
Do not broadcast VOLUME_STATE_CHANGED before boot has completed.
...
This is for avoiding unnecessary launch of processes which receive
VOLUME_STATE_CHANGED (e.g. com.android.externalstorage) duting boot.
This change improves boot time by ~200 ms.
BUG: 22163689
Change-Id: I76d39695552d49b6188bad8fdae81c5744013396
2015-08-24 14:16:41 +09:00
Sungmin Choi
ae046508b0
Don't show roaming icon when connecting HT HR network with Tele2 SIM
...
Bug: 23263661
Change-Id: Idcc52d53f7d7860ca561688ea311fdf50f3447b2
2015-08-23 15:46:51 -07:00
Eino-Ville Talvala
6960966f17
am 8c0104ef: am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '8c0104ef9fe5152c742a456c564c6588878e7645':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 07:24:08 +00:00
Eino-Ville Talvala
8c0104ef9f
am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'b5a913f9e264b79f5c714d4a590a44dac2ed2cf2':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 06:00:44 +00:00
Eino-Ville Talvala
b5a913f9e2
am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'f99eba07c0d49e31e9a274fba6d10bc42fc2c942':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:53:29 +00:00
Eino-Ville Talvala
f99eba07c0
am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit 'ec2efb9cac57f0cd6c371422114a37c5c9791ec8':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:45:46 +00:00
Eino-Ville Talvala
ec2efb9cac
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:38:01 +00:00
Eino-Ville Talvala
08b12dfba6
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
2015-08-22 05:33:26 +00:00
Jorim Jaggi
197fb8c1bc
am 96bc5efd: am b25c4e64: am 7795faac: am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
...
* commit '96bc5efdbc2582eca81d101a5997f7e43675fa4b':
Fix jank when clicking on HUN
2015-08-22 01:38:39 +00:00
Andrew Solovay
795f203a86
am a24e518d: am 906cc3f4: am 3f233293: am e2ca8593: am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
...
* commit 'a24e518dd85c6c5935c44eff10a286fb96378167':
docs: Fix return info for support lib checkSelfPermission()
2015-08-22 01:38:31 +00:00
Eino-Ville Talvala
7ca1f243b8
am cf620038: am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'cf620038f4af0fec5980fd9ef8e9234cfaf7670c':
Camera: Fix depth documentation issues
2015-08-22 01:38:25 +00:00
Glenn Kasten
d62b9fc172
am 6136d306: am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
...
* commit '6136d30641aae3f679aa768b7e8ed6d1025510cf':
MIDI docs: fix buffer allocation
2015-08-22 01:38:12 +00:00
Cheryl Potter
2d60fd1111
am 8b394af7: (-s ours) am 0be53aef: am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
...
* commit '8b394af7e65269152fc77a4cc3a4ba68a8f1bbd9':
docs: changed red to yellow in code snippet
2015-08-22 01:38:05 +00:00
Jorim Jaggi
96bc5efdbc
am b25c4e64: am 7795faac: am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
...
* commit 'b25c4e64a61f78eef1efeaf96b02548a422f6d90':
Fix jank when clicking on HUN
2015-08-22 01:28:41 +00:00
Blazej Magnowski
c3866bf81f
Merge "System to track touch and sensor events before unlocking the phone"
2015-08-22 01:25:18 +00:00
Fyodor Kupolov
3a22ad0ac4
am 09dbd46a: am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
...
* commit '09dbd46af8faa60419a97e926463dc25fbd0513f':
Fixed a typo in convertRestrictionsToBundle JavaDoc
2015-08-22 01:22:32 +00:00
Adrian Roos
cb20f55415
am f83da111: am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'f83da11131cfa0069fd4d455a74379968a7772ee':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 01:22:25 +00:00
Jim Miller
c7506b3718
am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
Fix type-o in FingerprintManager documentation
2015-08-22 01:22:18 +00:00
Trevor Bunker
44f50b3604
am 421244f4: am b1dded03: am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
...
* commit '421244f4e369ac49d2f32a66c0a0c85c861c1b56':
Add support for new window orientation sensor.
2015-08-22 01:22:12 +00:00
Jorim Jaggi
b25c4e64a6
am 7795faac: am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
...
* commit '7795faace682aee863d836da91364b2ea5632c8f':
Fix jank when clicking on HUN
2015-08-22 01:22:01 +00:00
Jorim Jaggi
7795faace6
am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev
...
* commit '4351111bbb8b64ff8a89be549c0a503d487b1a78':
Fix jank when clicking on HUN
2015-08-22 01:16:44 +00:00
Eric Laurent
4e1ccd370f
AudioTrack: error reporting for getTimestamp()
...
Add a new getTimestamp() method that returns an error code.
Bug: 21886109.
Bug: 22202349.
Bug: 17548098.
Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
2015-08-21 18:11:21 -07:00
Jorim Jaggi
4351111bbb
Merge "Fix jank when clicking on HUN" into mnc-dr-dev
2015-08-22 01:10:17 +00:00