drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,309 Commits 1 Branch 0 Tags
Commit Graph

114309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
fb1854b45d Import translations. DO NOT MERGE 
Change-Id: I2512b43867fbd6821e94b937b31768c313bfd8b4
Auto-generated-cl: translation import
 2013-09-18 23:59:33 -07:00
Svetoslav
0deaef89f2 am 45c7abcd: am ac7297bd: Merge "Fixes in the page range selection and verification logic." into klp-dev 
* commit '45c7abcd94a8f4da91c86b5381bbf908d211c187':
  Fixes in the page range selection and verification logic.
 2013-09-18 19:22:12 -07:00
Svetoslav
45c7abcd94 am ac7297bd: Merge "Fixes in the page range selection and verification logic." into klp-dev 
* commit 'ac7297bdc04e2097e39b791064e5ed6ee92680ea':
  Fixes in the page range selection and verification logic.
 2013-09-18 19:19:46 -07:00
Svetoslav
ac7297bdc0 Merge "Fixes in the page range selection and verification logic." into klp-dev 2013-09-19 02:16:11 +00:00
Jeff Sharkey
c5b53a4378 am 54a3bc88: am 0972ae15: Merge "Save directory state and animate." into klp-dev 
* commit '54a3bc8866ab5b3d324fe4efe08fa379af3249b3':
  Save directory state and animate.
 2013-09-18 18:19:14 -07:00
Jeff Sharkey
54a3bc8866 am 0972ae15: Merge "Save directory state and animate." into klp-dev 
* commit '0972ae156b2e7f033baaf551e26b425e90faa895':
  Save directory state and animate.
 2013-09-18 18:16:20 -07:00
James Kelly
5e55e6f19c am acf4f940: am 03f66d59: am 1f8cf09c: am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit 'acf4f940322f870474c83983a1b1a7a86fa5a19c':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:15:47 -07:00
James Kelly
acf4f94032 am 03f66d59: am 1f8cf09c: am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit '03f66d59286809a28e20f1f487ab6c135dd4d298':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:12:48 -07:00
Jeff Sharkey
0972ae156b Merge "Save directory state and animate." into klp-dev 2013-09-19 01:12:34 +00:00
James Kelly
03f66d5928 am 1f8cf09c: am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit '1f8cf09c53c72d26ca67974d1b7e51112be4a170':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:10:14 -07:00
James Kelly
1f8cf09c53 am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit '2815bb05a042975b282f7131514368aa89cf0dd4':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:07:02 -07:00
James Kelly
2815bb05a0 am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 
* commit '48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3':
  more string changes for wi-fi trademark compliance
 2013-09-18 18:04:45 -07:00
James Kelly
48c6b5735e Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs 2013-09-19 01:02:13 +00:00
Jeff Sharkey
e20a3acdc2 Save directory state and animate. 
Save scroll position and restore when rotating or going up the
directory stack.  Also show directory animations when navigating
the directory stack.

Bug: 10417201
Change-Id: Ia2c508debc2bffffe6306eb9078afefef259dfe2
 2013-09-18 17:12:25 -07:00
Jim Miller
8b7ea57f8e am cd87d0ab: am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev 
* commit 'cd87d0ab9623d5028d767e8167923c57aa2bac0d':
  Fix keyguard/Keystore storage issue
 2013-09-18 17:06:21 -07:00
Jim Miller
cd87d0ab96 am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev 
* commit 'f429247867ac524cf63bc01499ac47a90ebcaca9':
  Fix keyguard/Keystore storage issue
 2013-09-18 17:02:48 -07:00
Jim Miller
f429247867 Merge "Fix keyguard/Keystore storage issue" into klp-dev 2013-09-19 00:00:22 +00:00
Jason Monk
41d6e07bf2 am 275d1adf: am ff65c6da: Merge "Fix PacManager to not unbind when no connection" into klp-dev 
* commit '275d1adf0a8d7817f9a28c92822f5adb405528ff':
  Fix PacManager to not unbind when no connection
 2013-09-18 16:55:28 -07:00
Jason Monk
275d1adf0a am ff65c6da: Merge "Fix PacManager to not unbind when no connection" into klp-dev 
* commit 'ff65c6daab5268c28b3663cd02c1b3dfa6f1c90a':
  Fix PacManager to not unbind when no connection
 2013-09-18 16:53:06 -07:00
Jason Monk
ff65c6daab Merge "Fix PacManager to not unbind when no connection" into klp-dev 2013-09-18 23:51:07 +00:00
Amith Yamasani
0125d4bd25 am 2f9fd33f: am e8c01ddb: Merge "Changes to PFD based on API review" into klp-dev 
* commit '2f9fd33fd9cad3bbd8edffefa9c65cbeb7e50c94':
  Changes to PFD based on API review
 2013-09-18 16:47:50 -07:00
Amith Yamasani
2f9fd33fd9 am e8c01ddb: Merge "Changes to PFD based on API review" into klp-dev 
* commit 'e8c01ddbe748490463f7f516df9b1b4784228913':
  Changes to PFD based on API review
 2013-09-18 16:45:32 -07:00
Amith Yamasani
e8c01ddbe7 Merge "Changes to PFD based on API review" into klp-dev 2013-09-18 23:43:11 +00:00
Alan Viverette
7f67d7206a am 8ac0d137: am 564c45b9: Merge "Fix number picker vertical scroll computations" into klp-dev 
* commit '8ac0d137ba11958312e25225d8d0776aad71b022':
  Fix number picker vertical scroll computations
 2013-09-18 16:42:15 -07:00
Alan Viverette
8ac0d137ba am 564c45b9: Merge "Fix number picker vertical scroll computations" into klp-dev 
* commit '564c45b976b56bc33f18271e1c813a0bd91b2eb4':
  Fix number picker vertical scroll computations
 2013-09-18 16:38:55 -07:00
Amith Yamasani
b433bb8c96 Changes to PFD based on API review 
Removed boolean param to ask for exception on detached fd. Use a
subclass of IOException instead.

Bug: 10461576
Change-Id: If7db16120297edcdb7d5d5905ed453003be0e38e
 2013-09-18 16:35:05 -07:00
Alan Viverette
564c45b976 Merge "Fix number picker vertical scroll computations" into klp-dev 2013-09-18 23:35:02 +00:00
Victoria Lease
00315e2eb0 am 7ca74d0c: am c47a0bf3: Merge "restore coverage lost in NotoColorEmoji transition" into klp-dev 
* commit '7ca74d0c5f2c54fb65918c7cf4764ff8851d37c1':
  restore coverage lost in NotoColorEmoji transition
 2013-09-18 16:20:35 -07:00
Victoria Lease
7ca74d0c5f am c47a0bf3: Merge "restore coverage lost in NotoColorEmoji transition" into klp-dev 
* commit 'c47a0bf3860d41879f94780460af402f4f8d2a46':
  restore coverage lost in NotoColorEmoji transition
 2013-09-18 16:18:18 -07:00
Victoria Lease
c47a0bf386 Merge "restore coverage lost in NotoColorEmoji transition" into klp-dev 2013-09-18 23:15:29 +00:00
Nick Kralevich
cc94a76a73 am b18e0d14: am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround." 
* commit 'b18e0d14334d5757b21e4f089706affe29822447':
  revert ADDR_COMPAT_LAYOUT workaround.
 2013-09-18 16:09:11 -07:00
Craig Mautner
d4338177c0 am 2325fd5d: am 4ef2693a: Revert back to a single home app in mHomeProcess 
* commit '2325fd5d1192553c7056eeec2e1e458886dd173f':
  Revert back to a single home app in mHomeProcess
 2013-09-18 16:05:29 -07:00
Nick Kralevich
b18e0d1433 am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround." 
* commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8':
  revert ADDR_COMPAT_LAYOUT workaround.
 2013-09-18 16:04:24 -07:00
Craig Mautner
2325fd5d11 am 4ef2693a: Revert back to a single home app in mHomeProcess 
* commit '4ef2693a243b308fad775a8a1691963c51ac925e':
  Revert back to a single home app in mHomeProcess
 2013-09-18 16:02:59 -07:00
Craig Mautner
4ef2693a24 Revert back to a single home app in mHomeProcess 
The idea of multiple processes serving as home was unfeasible.

- Revert "Allow for more than one home app." commit
e428a7f662f109a5f2015008e3161df23932483e.
- Assign ActivityManagerService.mHomeProcess to the process of the
root activity of the home task.

Addresses bug 10342471.

Change-Id: Ifb494626107d24de1306e320a18206d5b176a7c0
 2013-09-18 15:48:28 -07:00
Victoria Lease
4ce0931ffd restore coverage lost in NotoColorEmoji transition 
The following codepoints were previously provided by AndroidEmoji,
but are no longer present in our fallback chain. This commit restores
them by resurrecting a subset version of AndroidEmoji.ttf:

 U+25AB WHITE SMALL SQUARE
 U+25FB WHITE MEDIUM SQUARE
 U+25FC BLACK MEDIUM SQUARE
 U+25FD WHITE MEDIUM SMALL SQUARE
 U+25FE BLACK MEDIUM SMALL SQUARE
 U+2600 BLACK SUN WITH RAYS
 U+26AA MEDIUM WHITE CIRCLE
 U+26AB MEDIUM BLACK CIRCLE
 U+2757 HEAVY EXCLAMATION MARK SYMBOL
 U+2934 ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
 U+2935 ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
 U+2B05 LEFTWARDS BLACK ARROW
 U+2B06 UPWARDS BLACK ARROW
 U+2B07 DOWNWARDS BLACK ARROW
 U+2B1B BLACK LARGE SQUARE
 U+2B1C WHITE LARGE SQUARE
 U+2B50 WHITE MEDIUM STAR
 U+2B55 HEAVY LARGE CIRCLE
 U+303D PART ALTERNATION MARK

These characters see regular use in kaomoji constructions (and
elsewhere), and it really wouldn't do to lose them.

Bug: 10144988
Change-Id: I72b541aad01bc5ccac829be44ed259c461724142
 2013-09-18 15:30:32 -07:00
Nick Kralevich
78466f3eb5 am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround." 
* commit '69aa2f8a0555a5ca37fa78d5cfcbf59d7476d044':
  revert ADDR_COMPAT_LAYOUT workaround.
 2013-09-18 14:49:11 -07:00
Nick Kralevich
69aa2f8a05 Merge "revert ADDR_COMPAT_LAYOUT workaround." 2013-09-18 21:46:13 +00:00
Nick Kralevich
d53afd2b05 revert ADDR_COMPAT_LAYOUT workaround. 
Stop working around bad applications by setting ADDR_COMPAT_LAYOUT.
ADDR_COMPAT_LAYOUT is undesirable because it reduces the amount of
address space available to an application.

The Android emulator, in both 4.3 and 4.4, does not set
ADDR_COMPAT_LAYOUT. Anyone needing to test their application on a
version of Android without ADDR_COMPAT_LAYOUT can use the emulator
and reproduce the failures.

Change-Id: I8f753acc205798bd7f031026c7ece12d26de562c
 2013-09-18 14:29:46 -07:00
Svetoslav
932916b3e7 am 6d0db04b: am 7b3990ec: Merge "Update the print dialog." into klp-dev 
* commit '6d0db04bed79f371b537feae3efa9b5e6fe8876c':
  Update the print dialog.
 2013-09-18 14:27:03 -07:00
Svetoslav Ganov
1e40a1e0f8 am 107218d7: am f5293b6b: Merge "The printers in print dialog should not change position." into klp-dev 
* commit '107218d741811e93350577aac3e38b8528ef45e3':
  The printers in print dialog should not change position.
 2013-09-18 14:26:58 -07:00
Raph Levien
0a675ae85a am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev 
* commit '954f0d7b775b67c3ceeb7d3f646479fbc420fbd7':
  Revert "Revert "Take the input device into account for meta state""
 2013-09-18 14:26:45 -07:00
Amith Yamasani
8f61c7e858 am b129e946: am a6f387a0: Merge "Don\'t handle click if the resolver is already finishing." into klp-dev 
* commit 'b129e9466f9715d5729ad5bf6c96bae5164014c1':
  Don't handle click if the resolver is already finishing.
 2013-09-18 14:26:41 -07:00
Kenny Root
b5a14f0fc9 resolved conflicts for merge of 1995a7de to master 
Change-Id: I9915ae06d460696b24cbee935738267911baa580
 2013-09-18 14:23:58 -07:00
Svetoslav
f0c48a72fd Fixes in the page range selection and verification logic. 
1. Typing a range where the start is greater than the end was
   leading to a crash.

2. Typing the same single range, e.g. "2,2", was leading to a crash.

3. If two ranges are non-overlapping but consecutive they were
   not merged

4. Typing multiple times a digit that is less than the page count,
   e.g. page count "2" and typing "11", was not caught by the input
   verification.

bug:10812904

Change-Id: I754715b5d792a1a6c3a4f9f644edfa9aea7ac127
 2013-09-18 14:13:06 -07:00
Svetoslav
6d0db04bed am 7b3990ec: Merge "Update the print dialog." into klp-dev 
* commit '7b3990ec81fc218f655d44624758e15ce378968e':
  Update the print dialog.
 2013-09-18 14:12:58 -07:00
Svetoslav Ganov
107218d741 am f5293b6b: Merge "The printers in print dialog should not change position." into klp-dev 
* commit 'f5293b6bc0567be58ac3039691ec1cf9455dc28e':
  The printers in print dialog should not change position.
 2013-09-18 14:09:29 -07:00
Svetoslav
7b3990ec81 Merge "Update the print dialog." into klp-dev 2013-09-18 21:08:49 +00:00
Svetoslav Ganov
f5293b6bc0 Merge "The printers in print dialog should not change position." into klp-dev 2013-09-18 21:06:39 +00:00
Raph Levien
954f0d7b77 am ba1abbba: Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev 
* commit 'ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0':
  Revert "Revert "Take the input device into account for meta state""
 2013-09-18 13:42:41 -07:00